Merge pull request #4240 from pypeclub/feature/OP-4657_qtpy-in-hiero

Hiero: Use qtpy in Hiero
ynput · Dec 19, 2022 · 45c26f3 · 45c26f3
2 parents 7097250 + 4c214ca
commit 45c26f3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/openpype/hosts/hiero/api/launchforhiero.py b/openpype/hosts/hiero/api/launchforhiero.py
@@ -1,7 +1,7 @@
 import logging
 
 from scriptsmenu import scriptsmenu
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 
 log = logging.getLogger(__name__)

diff --git a/openpype/hosts/hiero/api/lib.py b/openpype/hosts/hiero/api/lib.py
@@ -15,7 +15,11 @@
 import shutil
 import hiero
 
-from Qt import QtWidgets, QtCore, QtXml
+from qtpy import QtWidgets, QtCore
+try:
+ from PySide import QtXml
+except ImportError:
+ from PySide2 import QtXml
 
 from openpype.client import get_project
 from openpype.settings import get_project_settings

diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
@@ -43,7 +43,7 @@ def menu_install():
 
  """
 
- from Qt import QtGui
+ from qtpy import QtGui
  from . import (
  publish, launch_workfiles_app, reload_config,
  apply_colorspace_project, apply_colorspace_clips

diff --git a/openpype/hosts/hiero/api/plugin.py b/openpype/hosts/hiero/api/plugin.py
@@ -5,7 +5,7 @@
 
 import hiero
 
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 import qargparse
 
 from openpype.settings import get_current_project_settings

diff --git a/openpype/hosts/hiero/plugins/publish/precollect_workfile.py b/openpype/hosts/hiero/plugins/publish/precollect_workfile.py
@@ -3,7 +3,7 @@
 from pprint import pformat
 
 import pyblish.api
-from Qt.QtGui import QPixmap
+from qtpy.QtGui import QPixmap
 
 import hiero.ui