Merge pull request #2599 from alicevision/dev/qt6.6

Qt6.6.3 / PySide6.6.3.1 upgrade

Author: fabiencastan

.git-blame-ignore-revs

@@ -1,3 +1,5 @@
+# [qt6][qml] Clean-up code and harmonize comments
+5a0b1c0c9547b0d00f3f10fae6994d6d8ea0b45e
 # [nodes] Linting: Clean-up files
 4c0409f573c2694325b104c2686a1532f95cb9bc
 # Linting: Clean-up files

COPYING.md

@@ -15,7 +15,7 @@ Meshroom is licensed under the [MPL2 license](LICENSE-MPL2.md).
    Copyright (c) 2001-2018 Python Software Foundation.  
    Distributed under the [PSFL V2 license](https://www.python.org/download/releases/2.7/license/).
 
- * __Qt/PySide2__  
+ * __Qt/PySide6__
    [https://www.qt.io](https://www.qt.io)  
    Copyright (C) 2018 The Qt Company Ltd and other contributors.  
    Distributed under the [LGPL V3 license](https://opensource.org/licenses/LGPL-3.0).

meshroom/__init__.py

@@ -157,3 +157,4 @@ def addToEnvPath(var, val, index=-1):
 os.environ["QML_XHR_ALLOW_FILE_READ"] = '1'
 os.environ["QML_XHR_ALLOW_FILE_WRITE"] = '1'
 os.environ["PYSEQ_STRICT_PAD"] = '1'
+os.environ["QSG_RHI_BACKEND"] = "opengl"

meshroom/common/qt.py

@@ -1,5 +1,5 @@
-from PySide2 import QtCore, QtQml
-import shiboken2
+from PySide6 import QtCore, QtQml
+import shiboken6
 
 
 class QObjectListModel(QtCore.QAbstractListModel):
@@ -285,7 +285,7 @@ def _referenceItem(self, item):
 
     def _dereferenceItem(self, item):
         # Ask for object deletion if parented to the model
-        if shiboken2.isValid(item) and item.parent() == self:
+        if shiboken6.isValid(item) and item.parent() == self:
             # delay deletion until the next event loop
             # This avoids warnings when the QML engine tries to evaluate (but should not)
             # an object that has already been deleted

meshroom/core/node.py

@@ -116,8 +116,11 @@ def elapsedTimeStr(self):
 
     def toDict(self):
         d = self.__dict__.copy()
-        d.pop('destroyed', None)  # skip non data attributes from BaseObject
         d["elapsedTimeStr"] = self.elapsedTimeStr
+
+        # Skip non data attributes from BaseObject
+        d.pop("destroyed", None)
+        d.pop("objectNameChanged", None)
         return d
 
     def fromDict(self, d):

meshroom/submitters/simpleFarmSubmitter.py

@@ -39,7 +39,7 @@ def __init__(self, parent=None):
                 # logging.info('REZ: {}'.format(str(r)))
                 v = r.split('-')
                 # logging.info('    v: {}'.format(str(v)))
-                if len(v) == 2:
+                if len(v) >= 2:
                     resolvedVersions[v[0]] = v[1]
             for p in packages:
                 if p.startswith('~'):

meshroom/ui/__main__.py

@@ -10,4 +10,4 @@
 import meshroom.ui.app
 
 meshroom.ui.uiInstance = meshroom.ui.app.MeshroomApp(sys.argv)
-meshroom.ui.uiInstance.exec_()
+meshroom.ui.uiInstance.exec()

meshroom/ui/app.py

@@ -4,10 +4,11 @@
 import argparse
 import json
 
-from PySide2 import QtCore
-from PySide2.QtCore import Qt, QUrl, QJsonValue, qInstallMessageHandler, QtMsgType, QSettings
-from PySide2.QtGui import QIcon
-from PySide2.QtWidgets import QApplication
+from PySide6 import __version__ as PySideVersion
+from PySide6 import QtCore
+from PySide6.QtCore import Qt, QUrl, QJsonValue, qInstallMessageHandler, QtMsgType, QSettings
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QApplication
 
 import meshroom
 from meshroom.core import nodesDesc
@@ -188,7 +189,7 @@ class MeshroomApp(QApplication):
     def __init__(self, args):
         meshroom.core.initPipelines()
 
-        QtArgs = [args[0], '-style', 'fusion'] + args[1:]  # force Fusion style by default
+        QtArgs = [args[0], '-style', 'Fusion'] + args[1:]  # force Fusion style by default
 
         args = createMeshroomParser(args)
 
@@ -202,8 +203,6 @@ def __init__(self, args):
         }
         logging.getLogger().setLevel(logStringToPython[args.verbose])
 
-        QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
-
         super(MeshroomApp, self).__init__(QtArgs)
 
         self.setOrganizationName('AliceVision')
@@ -355,6 +354,7 @@ def _recentProjectFiles(self):
                 p = {"path": p, "thumbnail": thumbnail}
                 projects.append(p)
         settings.endArray()
+        settings.endGroup()
         return projects
 
     @Slot(str)
@@ -394,6 +394,7 @@ def addRecentProjectFile(self, projectFile):
             settings.setArrayIndex(i)
             settings.setValue("filepath", p)
         settings.endArray()
+        settings.endGroup()
         settings.sync()
 
         self.recentProjectFilesChanged.emit()
@@ -539,7 +540,8 @@ def _systemInfo(self):
         import sys
         return {
             'platform': '{} {}'.format(platform.system(), platform.release()),
-            'python': 'Python {}'.format(sys.version.split(" ")[0])
+            'python': 'Python {}'.format(sys.version.split(" ")[0]),
+            'pyside': 'PySide6 {}'.format(PySideVersion)
         }
 
     systemInfo = Property(QJsonValue, _systemInfo, constant=True)

meshroom/ui/commands.py

@@ -2,8 +2,8 @@
 import traceback
 from contextlib import contextmanager
 
-from PySide2.QtWidgets import QUndoCommand, QUndoStack
-from PySide2.QtCore import Property, Signal
+from PySide6.QtGui import QUndoCommand, QUndoStack
+from PySide6.QtCore import Property, Signal
 
 from meshroom.core.attribute import ListAttribute, Attribute
 from meshroom.core.graph import GraphModification

meshroom/ui/components/__init__.py

@@ -1,6 +1,6 @@
 
 def registerTypes():
-    from PySide2.QtQml import qmlRegisterType
+    from PySide6.QtQml import qmlRegisterType
     from meshroom.ui.components.clipboard import ClipboardHelper
     from meshroom.ui.components.edge import EdgeMouseArea
     from meshroom.ui.components.filepath import FilepathHelper