fix issue based on review comment

Signed-off-by: Cédrik Fuoco <[email protected]>

Author: cedrik-fuoco-adsk

.gitignore

@@ -29,7 +29,7 @@ _build*/*
 _install/*
 .venv/*
 
-# These are no generated by CMake using template to support Qt5 and Qt6.
+# These are now generated by CMake using template to support Qt5 and Qt6.
 # See rvui.mu.in
 rvui.mu 
 # See window_mode.mu.in

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

@@ -1,25 +1,23 @@
 #
-# Copyright (C) 2023  Autodesk, Inc. All Rights Reserved. 
-# 
-# SPDX-License-Identifier: Apache-2.0 
+# Copyright (C) 2023  Autodesk, Inc. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 import unittest
 
 try:
-    import PySide2
-    from PySide2 import *
+    import PySide2 as PySide
 except ImportError:
-  try:
-    import PySide6
-    from PySide6 import *
-  except ImportError:
-    pass
+    try:
+        import PySide6 as PySide
+    except ImportError:
+        pass
 
 
 class TestPySide2(unittest.TestCase):
     def test_getting_qt_instance(self):
         self.assertIsNotNone(
-            QtCore.QCoreApplication.instance(),
+            PySide.QtCore.QCoreApplication.instance(),
             "We should have an application defined from py-interp's qt bindings.",
         )
 

src/build/make_pyside6.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # *****************************************************************************
-# Copyright 2020 Autodesk, Inc. All rights reserved.
+# Copyright 2024 Autodesk, Inc. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -216,25 +216,6 @@ def build() -> None:
     if OPENSSL_OUTPUT_DIR:
         pyside_build_args.append(f"--openssl={os.path.join(OPENSSL_OUTPUT_DIR, 'bin')}")
 
-    # PySide2 v5.15.2.1 builds with errors on Windows using Visual Studio 2019.
-    # We force Visual Studio 2017 here to make it build without errors.
-    # if platform.system() == "Windows":
-    #     # Add Qt jom to the path to build in parallel
-    #     jom_path = os.path.abspath(
-    #         os.path.join(QT_OUTPUT_DIR, "..", "..", "Tools", "QtCreator", "bin", "jom")
-    #     )
-    #     if os.path.exists(os.path.join(jom_path, "jom.exe")):
-    #         print(f"jom.exe was successfully located at: {jom_path}")
-    #         update_env_path([jom_path])
-    #     else:
-    #         print(f"Could not find jom.exe at the expected location: {jom_path}")
-    #         print(f"Build performance might be impacted")
-
-    #     # Add the debug switch to match build type but only on Windows
-    #     # (on other platforms, PySide2 is built in release)
-    #     if VARIANT == "Debug":
-    #         pyside_build_args.append("--debug")
-
     print(f"Executing {pyside_build_args}")
     subprocess.run(pyside_build_args).check_returncode()
 

src/lib/app/RvCommon/QTGLVideoDevice.cpp

@@ -70,9 +70,9 @@ GLVideoDevice*
 QTGLVideoDevice::newSharedContextWorkerDevice() const
 {
     // NOTE_QT: QOpenGLWidget does not take a share parameter anymore. Try to share with setShareContext.
-    QOpenGLWidget* w = new QOpenGLWidget(m_view->parentWidget());
-    w->context()->setShareContext(m_view->context());
-    return new QTGLVideoDevice(name() + "-workerContextDevice", w);
+    QOpenGLWidget* openGLWidget = new QOpenGLWidget(m_view->parentWidget());
+    openGLWidget->context()->setShareContext(m_view->context());
+    return new QTGLVideoDevice(name() + "-workerContextDevice", openGLWidget);
 }
 
 void 

src/lib/app/RvCommon/RvApplication.cpp

@@ -471,7 +471,6 @@ static void
 callRunCreateSession(void* a)
 {
     RvApplication* app = reinterpret_cast<RvApplication*>(a);
-    std::cout << "??? Calling runCreateSession" << std::endl;
     app->runCreateSession();
 }