Merge pull request #26 from nlsfi/pyqt6-support

Add official PyQt6 support

Author: chrisjbillington

README.md

@@ -4,9 +4,9 @@
 ![GitHub release](https://img.shields.io/github/last-commit/philipstarkey/qtutils.svg)
 [![Python Version](https://img.shields.io/pypi/pyversions/qtutils.svg)](https://python.org)
 [![Documentation Status](https://readthedocs.org/projects/qtutils/badge/?version=stable)](https://qtutils.readthedocs.io/en/stable/?badge=stable)
-[![PyPi Version](https://img.shields.io/pypi/v/qtutils.svg)](https://pypi.python.org/pypi/qtutils/) 
+[![PyPi Version](https://img.shields.io/pypi/v/qtutils.svg)](https://pypi.python.org/pypi/qtutils/)
 [![Conda Version](https://img.shields.io/conda/v/labscript-suite/qtutils)](https://anaconda.org/labscript-suite/qtutils)
-[![PyPi License](https://img.shields.io/pypi/l/qtutils.svg)](https://github.com/philipstarkey/qtutils/blob/master/LICENSE.txt) 
+[![PyPi License](https://img.shields.io/pypi/l/qtutils.svg)](https://github.com/philipstarkey/qtutils/blob/master/LICENSE.txt)
 
 Utilities for providing concurrent access to Qt objects, simplified QSettings storage,
 and dynamic widget promotion when loading UI files, in Python Qt applications. Includes
@@ -30,7 +30,7 @@ license](https://ubuntu.com/legal/font-licence)).
 ## Summary
 
 `qtutils` is a Python library that provides some convenient features to Python
-applications using the PyQt5/PySide6 widget library.
+applications using the PyQt5/PyQt6/PySide6 widget library.
 
 `qtutils` 4.0 dropped support for PySide2. If you need to use PySide2, you may use
 `qtutils` 3.1.0 or earlier.
@@ -53,8 +53,8 @@ applications using the PyQt5/PySide6 widget library.
   If you can't or don't want to provide attribution, please purchase a royalty-free
   license from http://p.yusukekamiyamane.com/
 
-* `Qt`: a PyQt5/PySide6 agnostic interface to Qt that allows you to import qtutils.qt
-  instead of PySide6 or PyQt5, and have your code run on both, with some convenience
+* `Qt`: a PyQt5/PyQt6/PySide6 agnostic interface to Qt that allows you to import qtutils.qt
+  instead of PySide6 or PyQt5/6, and have your code run on both, with some convenience
   aliases to make it easier to write code that works with both libraries. Note that this
   is not a comprehensive abstraction layer like [QtPy](https://pypi.org/project/QtPy/)
   and your code will still need to be written in a way generally compatible with both

qtutils/UiLoader.py

@@ -85,7 +85,11 @@ def load(self, uifile, toplevel_instance=None):
 
 else:
     from types import ModuleType
-    from PyQt5 import uic
+    try:
+        from PyQt5 import uic
+    except ImportError:
+        from PyQt6 import uic
+
 
     class UiLoader(object):
         def __init__(self):

qtutils/qt.py

@@ -20,9 +20,10 @@
 
 PYSIDE6 = 'PySide6'
 PYQT5 = 'PyQt5'
+PYQT6 = 'PyQt6'
 QT_ENV = None
 
-libs = [PYQT5, PYSIDE6]
+libs = [PYQT5, PYSIDE6, PYQT6]
 for lib in libs:
     if lib in sys.modules:
         QT_ENV = lib
@@ -41,6 +42,8 @@
 
 if QT_ENV == PYQT5:
     from PyQt5 import QtGui, QtCore, QtWidgets
+elif QT_ENV == PYQT6:
+    from PyQt6 import QtGui, QtCore, QtWidgets
 elif QT_ENV == PYSIDE6:
     from PySide6 import QtGui, QtCore, QtWidgets
 
@@ -49,13 +52,13 @@
 sys.modules['qtutils.qt.QtCore'] = QtCore
 
 # Make Signal available under both names 'Signal' and 'pyqtSignal':
-if QT_ENV ==  PYQT5:
+if QT_ENV in (PYQT5, PYQT6):
     QtCore.Signal = QtCore.pyqtSignal
 else:
     QtCore.pyqtSignal = QtCore.Signal
 
 # Make some names that moved from QtWidgets to QtGui available in both modules:
-if QT_ENV ==  PYQT5:
+if QT_ENV == PYQT5:
     QtGui.QAction = QtWidgets.QAction
     QtGui.QShortcut = QtWidgets.QShortcut
 else: