summaryrefslogtreecommitdiff
path: root/lib/taurus/external
diff options
context:
space:
mode:
Diffstat (limited to 'lib/taurus/external')
-rw-r--r--[-rwxr-xr-x]lib/taurus/external/qt/QtHelp.py0
-rw-r--r--lib/taurus/external/qt/QtWebKit.py12
-rw-r--r--lib/taurus/external/qt/__init__.py5
-rw-r--r--[-rwxr-xr-x]lib/taurus/external/qt/compat.py10
4 files changed, 18 insertions, 9 deletions
diff --git a/lib/taurus/external/qt/QtHelp.py b/lib/taurus/external/qt/QtHelp.py
index 233c9e02..233c9e02 100755..100644
--- a/lib/taurus/external/qt/QtHelp.py
+++ b/lib/taurus/external/qt/QtHelp.py
diff --git a/lib/taurus/external/qt/QtWebKit.py b/lib/taurus/external/qt/QtWebKit.py
index 37bdc8d4..c40a5d2b 100644
--- a/lib/taurus/external/qt/QtWebKit.py
+++ b/lib/taurus/external/qt/QtWebKit.py
@@ -29,16 +29,16 @@ from . import PYQT5, PYQT4, PYSIDE, PYSIDE2, PythonQtError
if PYQT5:
- from PyQt5.WebKit import *
+ from PyQt5.QtWebKit import *
# import * from QtWebkitWidgets for PyQt4 style compat
- from PyQt5.WebKitWidgets import *
+ from PyQt5.QtWebKitWidgets import *
elif PYSIDE2:
- from PySide2.WebKit import *
+ from PySide2.QtWebKit import *
# import * from QtWebkitWidgets for PyQt4 style compat
- from PySide2.WebKitWidgets import *
+ from PySide2.QtWebKitWidgets import *
elif PYQT4:
- from PyQt4.WebKit import *
+ from PyQt4.QtWebKit import *
elif PYSIDE:
- from PySide.WebKit import *
+ from PySide.QtWebKit import *
else:
raise PythonQtError('No Qt bindings could be found')
diff --git a/lib/taurus/external/qt/__init__.py b/lib/taurus/external/qt/__init__.py
index ee38d171..c149d197 100644
--- a/lib/taurus/external/qt/__init__.py
+++ b/lib/taurus/external/qt/__init__.py
@@ -230,10 +230,11 @@ if PYQT5 and getattr(__config, 'QT_AVOID_ABORT_ON_EXCEPTION', True):
# TODO: check if we also want to do this for PySide(2)
__addExceptHook()
-__log.info('Using %s (v%s , with Qt %s)',
+__log.info('Using %s (v%s with Qt %s and Python %s)',
API_NAME,
PYQT_VERSION or PYSIDE_VERSION,
- QT_VERSION)
+ QT_VERSION,
+ sys.version.split()[0])
# --------------------------------------------------------------------------
diff --git a/lib/taurus/external/qt/compat.py b/lib/taurus/external/qt/compat.py
index 735c207f..df105614 100755..100644
--- a/lib/taurus/external/qt/compat.py
+++ b/lib/taurus/external/qt/compat.py
@@ -41,4 +41,12 @@ getOpenFileName = getattr(QFileDialog, 'getOpenFileNameAndFilter',
getOpenFileNames = getattr(QFileDialog, 'getOpenFileNamesAndFilter',
QFileDialog.getOpenFileNames)
-del QFileDialog \ No newline at end of file
+# Provide a common constant for the PyObject name (to be used in signal
+# signatures)
+from taurus.external.qt import PYQT5, PYQT4
+if PYQT5 or PYQT4:
+ PY_OBJECT = 'PyQt_PyObject'
+else:
+ PY_OBJECT = 'PyObject'
+
+del QFileDialog, PYQT5, PYQT4 \ No newline at end of file