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

cmake/dependencies/qt6.cmake

@@ -16,17 +16,17 @@ IF(NOT RV_DEPS_QT6_LOCATION
 )
   MESSAGE(
     FATAL_ERROR
-      "Unable to build without a RV_DEPS_QT6_LOCATION. It is required to provide a working Qt 5.15 root path to build. Example: cmake .. -DRV_DEPS_QT6_LOCATION=/Users/rv/Qt/5.15.11/clang_64"
+      "Unable to build without a RV_DEPS_QT6_LOCATION. It is required to provide a working Qt 5.15 root path to build. Example: cmake .. -DRV_DEPS_QT6_LOCATION=/Users/rv/Qt/6.5.3/clang_64"
   )
 ENDIF()
 
-#TODO : I think that the resources folder changed location
+# TODO : I think that the resources folder changed location
 SET(RV_DEPS_QT6_RESOURCES_FOLDER
     "${RV_DEPS_QT6_LOCATION}/resources"
     CACHE STRING "Path to the Qt resources files folder"
 )
 
-#TODO : I think that the translations folder changed location
+# TODO : I think that the translations folder changed location
 SET(RV_DEPS_QT6_TRANSLATIONS_FOLDER
     "${RV_DEPS_QT6_LOCATION}/translations"
     CACHE STRING "Path to the Qt translations files folder"
@@ -49,19 +49,24 @@ FOREACH(
   ENDIF()
 ENDFOREACH()
 
-# Testing if everything is alright.
-# In Qt6, QtWebEngine has been split into Qt6WebEngineCore and Qt6WebEngineWidgets.
+# Testing if everything is alright. In Qt6, QtWebEngine has been split into Qt6WebEngineCore and Qt6WebEngineWidgets.
 FIND_PACKAGE(
   Qt6
   COMPONENTS Core WebEngineCore WebEngineWidgets
   REQUIRED
 )
 
-get_target_property(MOC_EXECUTABLE Qt6::moc IMPORTED_LOCATION)
-get_target_property(UIC_EXECUTABLE Qt6::uic IMPORTED_LOCATION)
+GET_TARGET_PROPERTY(MOC_EXECUTABLE Qt6::moc IMPORTED_LOCATION)
+GET_TARGET_PROPERTY(UIC_EXECUTABLE Qt6::uic IMPORTED_LOCATION)
 
-SET(QT_MOC_EXECUTABLE "${MOC_EXECUTABLE}" CACHE STRING "Qt MOC executable")
-SET(QT_UIC_EXECUTABLE "${UIC_EXECUTABLE}" CACHE STRING "Qt UIC executable")
+SET(QT_MOC_EXECUTABLE
+    "${MOC_EXECUTABLE}"
+    CACHE STRING "Qt MOC executable"
+)
+SET(QT_UIC_EXECUTABLE
+    "${UIC_EXECUTABLE}"
+    CACHE STRING "Qt UIC executable"
+)
 
 SET(_qt_copy_message
     "Copying Qt into ${RV_STAGE_ROOT_DIR}"
@@ -196,14 +201,13 @@ IF(RV_TARGET_WINDOWS)
       ${SRC_DIR}/*.exe
     )
 
-    # Filtering. Some executables are needed for RV to work:
-    # QtWebEngineProcess.exe
+    # Filtering. Some executables are needed for RV to work: QtWebEngineProcess.exe
     FOREACH(
-      _qt_executable 
+      _qt_executable
       ${_qt_executables}
     )
       IF("${_qt_executable}" STREQUAL "QtWebEngineProcess.exe")
-          LIST(REMOVE_ITEM _qt_executables "${_qt_executable}")
+        LIST(REMOVE_ITEM _qt_executables "${_qt_executable}")
       ENDIF()
     ENDFOREACH()
 
@@ -269,10 +273,14 @@ IF(RV_TARGET_WINDOWS)
   )
 ENDIF()
 
-
-# Qt5: OpenGLWidgets is in component Widgets
-# Qt6: OpenGLWidgets is in component OpenGLWidgets
-SET(QT6_QOPENGLWIDGET_COMPONENT "OpenGLWidgets" CACHE STRING "Qt QOpenGLWidget component name")
-SET(QT6_QOPENGLWIDGET_TARGET "Qt6::OpenGLWidgets" CACHE STRING "Qt QOpenGLWidget target name")
+# Qt5: OpenGLWidgets is in component Widgets Qt6: OpenGLWidgets is in component OpenGLWidgets
+SET(QT6_QOPENGLWIDGET_COMPONENT
+    "OpenGLWidgets"
+    CACHE STRING "Qt QOpenGLWidget component name"
+)
+SET(QT6_QOPENGLWIDGET_TARGET
+    "Qt6::OpenGLWidgets"
+    CACHE STRING "Qt QOpenGLWidget target name"
+)
 
 MESSAGE(STATUS "${_qt_copy_message} -- DONE")

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

@@ -1,19 +1,17 @@
 #
-# 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 *
+    from PySide2 import QtCore
 except ImportError:
-  try:
-    import PySide6
-    from PySide6 import *
-  except ImportError:
-    pass
+    try:
+        from PySide6 import QtCore
+    except ImportError:
+        pass
 
 
 class TestPySide2(unittest.TestCase):

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();
 }