removed QtWebKit support by default

Author: florianlink

extensions/PythonQt_QtAll/PythonQt_QtAll.cpp

@@ -39,14 +39,15 @@ void PythonQt_init_QtSvg(PyObject*);
 void PythonQt_init_QtSql(PyObject*);
 void PythonQt_init_QtNetwork(PyObject*);
 void PythonQt_init_QtCore(PyObject*);
-void PythonQt_init_QtWebKit(PyObject*);
 void PythonQt_init_QtOpenGL(PyObject*);
 void PythonQt_init_QtXml(PyObject*);
-void PythonQt_init_QtUiTools(PyObject*);
-
-#if QT_VERSION >= 0x050000
 void PythonQt_init_QtXmlPatterns(PyObject*);
 void PythonQt_init_QtMultimedia(PyObject*);
+void PythonQt_init_QtQml(PyObject*);
+void PythonQt_init_QtQuick(PyObject*);
+
+#ifdef PYTHONQT_WITH_WEBKIT
+void PythonQt_init_QtWebKit(PyObject*);
 #endif
 
 namespace PythonQt_QtAll
@@ -58,13 +59,14 @@ namespace PythonQt_QtAll
     PythonQt_init_QtXml(0);
     PythonQt_init_QtSvg(0);
     PythonQt_init_QtSql(0);
+#ifdef PYTHONQT_WITH_WEBKIT
     PythonQt_init_QtWebKit(0);
+#endif
     PythonQt_init_QtOpenGL(0);
-    PythonQt_init_QtUiTools(0);
-#if QT_VERSION >= 0x050000
     PythonQt_init_QtXmlPatterns(0);
     PythonQt_init_QtMultimedia(0);
-#endif
+    PythonQt_init_QtQml(0);
+    PythonQt_init_QtQuick(0);
   };
 };
 

extensions/PythonQt_QtAll/PythonQt_QtAll.pro

@@ -1,3 +1,5 @@
+# enable this to compile QtWebKit support in:
+#CONFIG += PythonQtWebKit
 
 TARGET   = PythonQt_QtAll
 TEMPLATE = lib
@@ -9,34 +11,32 @@ include ( ../../build/PythonQt.prf )
 
 CONFIG += dll qt
 
-DEFINES +=  PYTHONQT_QTALL_EXPORTS
+DEFINES += PYTHONQT_QTALL_EXPORTS
 
 HEADERS +=                \
   PythonQt_QtAll.h
 
 SOURCES +=                \
   PythonQt_QtAll.cpp
 
-QT += webkit gui svg sql network xml xmlpatterns opengl
-
-contains(QT_MAJOR_VERSION, 4) {
- CONFIG += uitools
-}
-
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets webkitwidgets printsupport multimedia multimediawidgets uitools
-}
+QT += gui svg sql network xml xmlpatterns opengl
+QT += widgets printsupport multimedia multimediawidgets
+QT += quick qml quickwidgets
 
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_svg/com_trolltech_qt_svg.pri)
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_sql/com_trolltech_qt_sql.pri)
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_network/com_trolltech_qt_network.pri)
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri)
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
 include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
-contains(QT_MAJOR_VERSION, 5) {
-  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri)
-  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)
-}
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_qml/com_trolltech_qt_qml.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_quick/com_trolltech_qt_quick.pri)
+
+PythonQtWebKit {
+  QT += webkit webkitwidgets
+  DEFINES += PYTHONQT_WITH_WEBKIT
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
+}