Merge branch 'release/3.15.x' into feature/OP-3845_nuke-convert-to-new-publisher

openpype/hosts/houdini/api/usd.py

@@ -3,7 +3,7 @@
 import contextlib
 import logging
 
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from openpype import style
 from openpype.client import get_asset_by_name

openpype/hosts/max/api/menu.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """3dsmax menu definition of OpenPype."""
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 from pymxs import runtime as rt
 
 from openpype.tools.utils import host_tools

openpype/hosts/maya/api/commands.py

@@ -39,7 +39,7 @@ class ToolWindows:
 
 
 def edit_shader_definitions():
-    from Qt import QtWidgets
+    from qtpy import QtWidgets
     from openpype.hosts.maya.api.shader_definition_editor import (
         ShaderDefinitionsEditor
     )

openpype/hosts/maya/api/lib.py

@@ -116,7 +116,7 @@ RENDERLIKE_INSTANCE_FAMILIES = ["rendering", "vrayscene"]
 
 def get_main_window():
     """Acquire Maya's main window"""
-    from Qt import QtWidgets
+    from qtpy import QtWidgets
 
     if self._parent is None:
         self._parent = {
@@ -3018,7 +3018,7 @@ def update_content_on_context_change():
 
 
 def show_message(title, msg):
-    from Qt import QtWidgets
+    from qtpy import QtWidgets
     from openpype.widgets import message_window
 
     # Find maya main window

openpype/hosts/maya/api/menu.py

@@ -1,7 +1,7 @@
 import os
 import logging
 
-from Qt import QtWidgets, QtGui
+from qtpy import QtWidgets, QtGui
 
 import maya.utils
 import maya.cmds as cmds

openpype/hosts/maya/api/pipeline.py

@@ -563,7 +563,7 @@ def on_save():
 def on_open():
     """On scene open let's assume the containers have changed."""
 
-    from Qt import QtWidgets
+    from qtpy import QtWidgets
     from openpype.widgets import popup
 
     cmds.evalDeferred(

openpype/hosts/maya/api/shader_definition_editor.py

@@ -5,7 +5,7 @@ Shader names are stored as simple text file over GridFS in mongodb.
 
 """
 import os
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 from openpype.client.mongo import OpenPypeMongoConnection
 from openpype import resources
 import gridfs

openpype/hosts/maya/plugins/load/actions.py

@@ -153,7 +153,7 @@ class ImportMayaLoader(load.LoaderPlugin):
 
         """
 
-        from Qt import QtWidgets
+        from qtpy import QtWidgets
 
         accept = QtWidgets.QMessageBox.Ok
         buttons = accept | QtWidgets.QMessageBox.Cancel

openpype/hosts/maya/plugins/load/load_image_plane.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 
 from openpype.client import (
     get_asset_by_id,

openpype/hosts/maya/plugins/load/load_look.py

@@ -3,7 +3,7 @@
 import json
 from collections import defaultdict
 
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 from openpype.client import get_representation_by_name
 from openpype.pipeline import (

openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py

@@ -89,7 +89,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
 
         """
 
-        from Qt import QtWidgets
+        from qtpy import QtWidgets
         from openpype.hosts.maya.api import lib
 
         # Store namespace in variable, cosmetics thingy

openpype/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.14.10-nightly.1"
+__version__ = "3.14.10-nightly.2"