Search/replace Qt5->Qt6 and import from QtOpenGL where needed.

part of upgrading Qt to v6.2: CURA-8591

UM/CentralFileStorage.py

@@ -6,7 +6,7 @@
 import os.path  # To re-format files with their proper file extension but with a version number in between.
 import shutil  # To move files in constant-time.
 from typing import List, Tuple, Dict
-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication
 
 from UM.Logger import Logger
 from UM.Resources import Resources  # To get the central storage location.

UM/ConfigurationErrorMessage.py

@@ -5,7 +5,7 @@
 import sys
 from typing import Iterable, Union, Optional
 
-from PyQt5.QtWidgets import QMessageBox
+from PyQt6.QtWidgets import QMessageBox
 
 from UM.i18n import i18nCatalog
 from UM.Message import Message

UM/FileHandler/FileHandler.py

@@ -5,7 +5,7 @@
 
 from .FileReader import FileReader
 from .FileWriter import FileWriter
-from PyQt5.QtCore import QFileInfo, QObject, pyqtProperty, pyqtSlot, QUrl
+from PyQt6.QtCore import QFileInfo, QObject, pyqtProperty, pyqtSlot, QUrl
 
 from UM.Logger import Logger
 from UM.Platform import Platform

UM/FileProvider.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import pyqtSignal, QObject
 
 from UM.PluginObject import PluginObject
 from typing import Optional

UM/FlameProfiler.py

@@ -7,7 +7,7 @@
 import functools
 from typing import List, Callable, Any
 
-from PyQt5.QtCore import pyqtSlot as pyqt5PyqtSlot
+from PyQt6.QtCore import pyqtSlot as PyQt6PyqtSlot
 from UM.Logger import Logger
 # A simple profiler which produces data suitable for viewing as a flame graph
 # when using the Big Flame Graph plugin.
@@ -215,9 +215,9 @@ def runIt(*args, ** kwargs):
 
 
 def pyqtSlot(*args, **kwargs) -> Callable[..., Any]:
-    """Drop in replacement for PyQt5's pyqtSlot decorator which records profiling information.
+    """Drop in replacement for PyQt6's pyqtSlot decorator which records profiling information.
 
-    See the PyQt5 documentation for information about pyqtSlot.
+    See the PyQt6 documentation for information about pyqtSlot.
     """
 
     if enabled():
@@ -230,9 +230,9 @@ def wrapped(*args2, **kwargs2):
                 else:
                     return function(*args2, **kwargs2)
 
-            return pyqt5PyqtSlot(*args, **kwargs)(wrapped)
+            return PyQt6PyqtSlot(*args, **kwargs)(wrapped)
         return wrapIt
     else:
         def dontWrapIt(function):
-            return pyqt5PyqtSlot(*args, **kwargs)(function)
+            return PyQt6PyqtSlot(*args, **kwargs)(function)
         return dontWrapIt

UM/Mesh/MeshFileHandler.py

@@ -2,7 +2,7 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 
 import os
-from PyQt5.QtCore import QObject, QUrl  # For typing.
+from PyQt6.QtCore import QObject, QUrl  # For typing.
 
 from UM.Logger import Logger
 from UM.Math.Matrix import Matrix

UM/Message.py

@@ -4,7 +4,7 @@
 from enum import IntEnum
 from typing import Optional, Union, Dict, List
 
-from PyQt5.QtCore import QTimer, pyqtSignal, QObject
+from PyQt6.QtCore import QTimer, pyqtSignal, QObject
 
 from UM.Logger import Logger
 from UM.Signal import Signal, signalemitter

UM/MimeTypeDatabase.py

@@ -2,7 +2,7 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 
 import os.path
-from PyQt5.QtCore import QMimeDatabase, QMimeType
+from PyQt6.QtCore import QMimeDatabase, QMimeType
 from typing import cast, List, Optional
 
 

UM/OutputDevice/ProjectOutputDevice.py

@@ -3,7 +3,7 @@
 
 from typing import Optional
 
-from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import pyqtSignal, QObject
 
 from UM.Application import Application
 from UM.OutputDevice.OutputDevice import OutputDevice

UM/PackageManager.py

@@ -10,7 +10,7 @@
 from json import JSONDecodeError
 from typing import Any, Dict, List, Optional, Set, Tuple, cast, TYPE_CHECKING
 
-from PyQt5.QtCore import pyqtSlot, QObject, pyqtSignal, QUrl, pyqtProperty, QCoreApplication
+from PyQt6.QtCore import pyqtSlot, QObject, pyqtSignal, QUrl, pyqtProperty, QCoreApplication
 
 from UM import i18nCatalog
 from UM.Logger import Logger

UM/PluginRegistry.py

@@ -11,8 +11,8 @@
 import zipfile
 from typing import Any, Callable, Dict, List, Optional, Tuple, TYPE_CHECKING
 
-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtCore import QObject, pyqtSlot, QUrl, pyqtProperty, pyqtSignal
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtCore import QObject, pyqtSlot, QUrl, pyqtProperty, pyqtSignal
 
 from UM.CentralFileStorage import CentralFileStorage
 from UM.Logger import Logger

UM/Qt/Bindings/ActiveToolProxy.py

@@ -2,7 +2,7 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 
 from typing import Any
-from PyQt5.QtCore import pyqtSlot, pyqtProperty, pyqtSignal, QObject, QUrl, QVariant
+from PyQt6.QtCore import pyqtSlot, pyqtProperty, pyqtSignal, QObject, QUrl, QVariant
 
 from UM.Application import Application
 from UM.Logger import Logger

UM/Qt/Bindings/ApplicationProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
 
 from UM.Application import Application
 from UM.Logger import Logger

UM/Qt/Bindings/BackendProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, Q_ENUMS
+from PyQt6.QtCore import QObject, pyqtSignal, pyqtProperty, Q_ENUMS
 
 from UM.i18n import i18nCatalog
 from UM.Application import Application

UM/Qt/Bindings/Bindings.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtQml import qmlRegisterType, qmlRegisterSingletonType, qmlRegisterUncreatableType
+from PyQt6.QtQml import qmlRegisterType, qmlRegisterSingletonType, qmlRegisterUncreatableType
 
 from UM.Qt.Bindings import StageModel, FileProviderModel, ProjectOutputDevicesModel
 from UM.Qt.Duration import Duration, DurationFormat

UM/Qt/Bindings/ContainerProxy.py

@@ -1,4 +1,4 @@
-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject
 from UM.FlameProfiler import pyqtSlot
 from typing import Dict, Any, Optional
 

UM/Qt/Bindings/ControllerProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSlot, pyqtSignal, pyqtProperty
+from PyQt6.QtCore import QObject, pyqtSlot, pyqtSignal, pyqtProperty
 
 from UM.Application import Application
 from UM.Decorators import deprecated

UM/Qt/Bindings/ExtensionModel.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt
 from UM.FlameProfiler import pyqtSlot
 from UM.Application import Application
 from UM.Qt.ListModel import ListModel

UM/Qt/Bindings/FileProviderModel.py

@@ -3,7 +3,7 @@
 
 from typing import Callable, Optional
 
-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt
 from UM.FlameProfiler import pyqtSlot
 from UM.i18n import i18nCatalog
 from UM.Qt.ListModel import ListModel

UM/Qt/Bindings/MainWindow.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2020 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import pyqtProperty, Qt, QCoreApplication, pyqtSignal, pyqtSlot, QMetaObject, QRectF, QRect
-from PyQt5.QtGui import QColor
-from PyQt5.QtQuick import QQuickWindow
+from PyQt6.QtCore import pyqtProperty, Qt, QCoreApplication, pyqtSignal, pyqtSlot, QMetaObject, QRectF, QRect
+from PyQt6.QtGui import QColor
+from PyQt6.QtQuick import QQuickWindow
 
 from UM.Logger import Logger
 from UM.Math.Matrix import Matrix

UM/Qt/Bindings/OpenGLContextProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtProperty, pyqtSignal
 from UM.View.GL.OpenGLContext import OpenGLContext
 
 

UM/Qt/Bindings/OperationStackProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
 
 from UM.Application import Application
 

UM/Qt/Bindings/OutputDeviceManagerProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
+from PyQt6.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
 from typing import List, Mapping, Optional, TYPE_CHECKING
 
 from UM.Application import Application
@@ -14,7 +14,7 @@
 from UM.Scene.Selection import Selection
 
 if TYPE_CHECKING:
-    from PyQt5.QtQml import QQmlEngine, QJSEngine
+    from PyQt6.QtQml import QQmlEngine, QJSEngine
     from UM.FileHandler.FileHandler import FileHandler
     from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager
 

UM/Qt/Bindings/OutputDevicesModel.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2020 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import Qt, pyqtSlot, pyqtProperty, pyqtSignal
+from PyQt6.QtCore import Qt, pyqtSlot, pyqtProperty, pyqtSignal
 
 from UM.Application import Application
 from UM.Qt.ListModel import ListModel
 
-from PyQt5.QtQml import QQmlEngine
+from PyQt6.QtQml import QQmlEngine
 
 
 class OutputDevicesModel(ListModel):

UM/Qt/Bindings/PointingRectangle.py

@@ -1,10 +1,10 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import pyqtProperty, pyqtSignal
-from PyQt5.QtCore import QPoint
-from PyQt5.QtGui import QColor
-from PyQt5.QtQuick import QQuickItem, QSGGeometryNode, QSGGeometry, QSGFlatColorMaterial
+from PyQt6.QtCore import pyqtProperty, pyqtSignal
+from PyQt6.QtCore import QPoint
+from PyQt6.QtGui import QColor
+from PyQt6.QtQuick import QQuickItem, QSGGeometryNode, QSGGeometry, QSGFlatColorMaterial
 
 
 class PointingRectangle(QQuickItem):

UM/Qt/Bindings/PreferencesProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSlot, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSlot, pyqtSignal
 
 from UM.Application import Application
 

UM/Qt/Bindings/ProjectOutputDevicesModel.py

@@ -2,8 +2,8 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 from typing import List
 
-from PyQt5.QtCore import Qt, pyqtSignal
-from PyQt5.QtQml import QQmlEngine
+from PyQt6.QtCore import Qt, pyqtSignal
+from PyQt6.QtQml import QQmlEngine
 
 from UM.Application import Application
 from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager

UM/Qt/Bindings/ResourcesProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, QUrl, Q_ENUMS
+from PyQt6.QtCore import QObject, QUrl, Q_ENUMS
 from UM.FlameProfiler import pyqtSlot
 
 import UM.Resources

UM/Qt/Bindings/SelectionProxy.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
+from PyQt6.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
 
 from UM.Application import Application
 from UM.Scene.Selection import Selection

UM/Qt/Bindings/StageModel.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2017 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt
 
 from UM.Application import Application
 from UM.PluginRegistry import PluginRegistry

UM/Qt/Bindings/Theme.py

@@ -7,9 +7,9 @@
 import warnings
 from typing import Dict, Optional, List
 
-from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, QCoreApplication, QUrl, QSizeF
-from PyQt5.QtGui import QColor, QFont, QFontMetrics, QFontDatabase
-from PyQt5.QtQml import QQmlComponent, QQmlContext
+from PyQt6.QtCore import QObject, pyqtProperty, pyqtSignal, QCoreApplication, QUrl, QSizeF
+from PyQt6.QtGui import QColor, QFont, QFontMetrics, QFontDatabase
+from PyQt6.QtQml import QQmlComponent, QQmlContext
 
 import UM.Application
 from UM.FlameProfiler import pyqtSlot

UM/Qt/Bindings/ToolModel.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QKeySequence
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QKeySequence
 
 from UM.Application import Application
 

UM/Qt/Bindings/Utilities.py

@@ -3,13 +3,13 @@
 from typing import List, TYPE_CHECKING
 from urllib.parse import urlparse
 
-from PyQt5.QtCore import pyqtSlot, QUrl, QObject
-from PyQt5.QtGui import QDesktopServices
+from PyQt6.QtCore import pyqtSlot, QUrl, QObject
+from PyQt6.QtGui import QDesktopServices
 
 from UM.Logger import Logger
 
 if TYPE_CHECKING:
-    from PyQt5.QtQml import QQmlEngine, QJSEngine
+    from PyQt6.QtQml import QQmlEngine, QJSEngine
 
 
 class UrlUtil(QObject):

UM/Qt/Bindings/ViewModel.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Uranium is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt
 
 from UM.Qt.ListModel import ListModel
 from UM.Application import Application

UM/Qt/Bindings/VisibleMessagesModel.py

@@ -2,7 +2,7 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 from typing import Union
 
-from PyQt5.QtCore import Qt, QUrl
+from PyQt6.QtCore import Qt, QUrl
 
 from UM.Application import Application
 from UM.FlameProfiler import pyqtSlot

UM/Qt/Bindings/i18nCatalogProxy.py

@@ -3,8 +3,8 @@
 
 import inspect
 
-from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject, QCoreApplication, pyqtSlot
-from PyQt5.QtQml import QJSValue
+from PyQt6.QtCore import pyqtProperty, pyqtSignal, QObject, QCoreApplication, pyqtSlot
+from PyQt6.QtQml import QJSValue
 
 from UM.i18n import i18nCatalog
 

UM/Qt/Duration.py

@@ -2,7 +2,7 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 from typing import Optional
 
-from PyQt5.QtCore import QObject, pyqtProperty, Q_ENUMS, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtProperty, Q_ENUMS, pyqtSignal
 from UM.FlameProfiler import pyqtSlot
 
 from datetime import timedelta