From 6dbaa33b73151dfacec82a34daba417d3e0694db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= Date: Wed, 21 Mar 2018 13:25:01 +0100 Subject: [PATCH 1/2] add support for Qt5 modules --- src/python_qt_binding/binding_helper.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/python_qt_binding/binding_helper.py b/src/python_qt_binding/binding_helper.py index 1764794..e65b191 100644 --- a/src/python_qt_binding/binding_helper.py +++ b/src/python_qt_binding/binding_helper.py @@ -65,17 +65,38 @@ def _select_qt_binding(binding_name=None, binding_order=None): 'QtWidgets', ] optional_modules = [ - 'QtDeclarative', + 'QtBluetooth', + 'QtDBus', + 'QtDeclarative', # Qt 4.x + 'QtDesigner', + 'QtHelp', + 'QtLocation', 'QtMultimedia', + 'QtMultimediaWidgets', 'QtNetwork', + 'QNetworkAuth', + 'QtNfc', 'QtOpenGL', - 'QtOpenVG', + 'QtOpenVG', # Qt 4.x + 'QtPositioning', + 'QtPrintSupport', + 'QtQml', + 'QtQuick', + 'QtQuickWidgets', 'QtScript', 'QtScriptTools' + 'QtSensors', + 'QtSerialPort', 'QtSql', 'QtSvg', + 'QtTest', + 'QtWebChannel', 'QtWebEngine', # Qt 5.6 and higher + 'QtWebEngineCore', + 'QtWebEngineWidgets', 'QtWebKitWidgets', # Qt 5.0 - 5.5 + 'QtWebSockets', + 'QtX11Extras', 'QtXml', 'QtXmlPatterns', ] From ed039156ed85ca62f934515d57f2a38678e9c2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= Date: Thu, 22 Mar 2018 12:20:11 +0100 Subject: [PATCH 2/2] remove Qt4.x only modules --- src/python_qt_binding/binding_helper.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/python_qt_binding/binding_helper.py b/src/python_qt_binding/binding_helper.py index e65b191..388bd88 100644 --- a/src/python_qt_binding/binding_helper.py +++ b/src/python_qt_binding/binding_helper.py @@ -67,7 +67,6 @@ def _select_qt_binding(binding_name=None, binding_order=None): optional_modules = [ 'QtBluetooth', 'QtDBus', - 'QtDeclarative', # Qt 4.x 'QtDesigner', 'QtHelp', 'QtLocation', @@ -77,7 +76,6 @@ def _select_qt_binding(binding_name=None, binding_order=None): 'QNetworkAuth', 'QtNfc', 'QtOpenGL', - 'QtOpenVG', # Qt 4.x 'QtPositioning', 'QtPrintSupport', 'QtQml',