Skip to content

Commit 76924a6

Browse files
fix issue based on review comment
Signed-off-by: Cédrik Fuoco <[email protected]>
1 parent 41ce483 commit 76924a6

File tree

5 files changed

+5
-27
lines changed

5 files changed

+5
-27
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _build*/*
2929
_install/*
3030
.venv/*
3131

32-
# These are no generated by CMake using template to support Qt5 and Qt6.
32+
# These are now generated by CMake using template to support Qt5 and Qt6.
3333
# See rvui.mu.in
3434
rvui.mu
3535
# See window_mode.mu.in

src/bin/python/py-interp/tests/test_PySide2.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77

88
try:
99
import PySide2
10-
from PySide2 import *
1110
except ImportError:
1211
try:
1312
import PySide6
14-
from PySide6 import *
1513
except ImportError:
1614
pass
1715

src/build/make_pyside6.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
# *****************************************************************************
5-
# Copyright 2020 Autodesk, Inc. All rights reserved.
5+
# Copyright 2024 Autodesk, Inc. All rights reserved.
66
#
77
# SPDX-License-Identifier: Apache-2.0
88
#
@@ -216,25 +216,6 @@ def build() -> None:
216216
if OPENSSL_OUTPUT_DIR:
217217
pyside_build_args.append(f"--openssl={os.path.join(OPENSSL_OUTPUT_DIR, 'bin')}")
218218

219-
# PySide2 v5.15.2.1 builds with errors on Windows using Visual Studio 2019.
220-
# We force Visual Studio 2017 here to make it build without errors.
221-
# if platform.system() == "Windows":
222-
# # Add Qt jom to the path to build in parallel
223-
# jom_path = os.path.abspath(
224-
# os.path.join(QT_OUTPUT_DIR, "..", "..", "Tools", "QtCreator", "bin", "jom")
225-
# )
226-
# if os.path.exists(os.path.join(jom_path, "jom.exe")):
227-
# print(f"jom.exe was successfully located at: {jom_path}")
228-
# update_env_path([jom_path])
229-
# else:
230-
# print(f"Could not find jom.exe at the expected location: {jom_path}")
231-
# print(f"Build performance might be impacted")
232-
233-
# # Add the debug switch to match build type but only on Windows
234-
# # (on other platforms, PySide2 is built in release)
235-
# if VARIANT == "Debug":
236-
# pyside_build_args.append("--debug")
237-
238219
print(f"Executing {pyside_build_args}")
239220
subprocess.run(pyside_build_args).check_returncode()
240221

src/lib/app/RvCommon/QTGLVideoDevice.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ GLVideoDevice*
7070
QTGLVideoDevice::newSharedContextWorkerDevice() const
7171
{
7272
// NOTE_QT: QOpenGLWidget does not take a share parameter anymore. Try to share with setShareContext.
73-
QOpenGLWidget* w = new QOpenGLWidget(m_view->parentWidget());
74-
w->context()->setShareContext(m_view->context());
75-
return new QTGLVideoDevice(name() + "-workerContextDevice", w);
73+
QOpenGLWidget* openGLWidget = new QOpenGLWidget(m_view->parentWidget());
74+
openGLWidget->context()->setShareContext(m_view->context());
75+
return new QTGLVideoDevice(name() + "-workerContextDevice", openGLWidget);
7676
}
7777

7878
void

src/lib/app/RvCommon/RvApplication.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ static void
471471
callRunCreateSession(void* a)
472472
{
473473
RvApplication* app = reinterpret_cast<RvApplication*>(a);
474-
std::cout << "??? Calling runCreateSession" << std::endl;
475474
app->runCreateSession();
476475
}
477476

0 commit comments

Comments
 (0)