patch from forum, move QT module dependencies into enabled wrappers

Author: florianlink

extensions/PythonQt_QtAll/PythonQt_QtAll.pro

@@ -41,11 +41,6 @@ HEADERS +=                \
 SOURCES +=                \
   PythonQt_QtAll.cpp
 
-# TODO: add these only when needed by configuration below
-QT += gui svg sql network xml xmlpatterns opengl
-QT += widgets printsupport multimedia multimediawidgets
-QT += quick qml quickwidgets uitools
-
 unix {
   CONFIG += create_pc create_prl no_install_prl
   QMAKE_PKGCONFIG_NAME = PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}
@@ -60,70 +55,84 @@ unix {
 unix: target.path = /lib
 win32: target.path = /
 
-INSTALLS += target
+headers.files = $${HEADERS}
+headers.path = /include
+
+INSTALLS += target headers
 
 PythonQtCore {
   DEFINES += PYTHONQT_WITH_CORE
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
 }
 
 PythonQtGui  {
   DEFINES += PYTHONQT_WITH_GUI
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
+  QT += gui widgets printsupport
 }
 
 PythonQtSvg {
   DEFINES += PYTHONQT_WITH_SVG
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_svg/com_trolltech_qt_svg.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_svg/com_trolltech_qt_svg.pri)
+  QT +=svg
 }
 
 PythonQtSql {
   DEFINES += PYTHONQT_WITH_SQL
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_sql/com_trolltech_qt_sql.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_sql/com_trolltech_qt_sql.pri)
+  QT += sql
 }
 
 PythonQtNetwork {
   DEFINES += PYTHONQT_WITH_NETWORK
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_network/com_trolltech_qt_network.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_network/com_trolltech_qt_network.pri)
+  QT += network
 }
 
 PythonQtOpengl {
   DEFINES += PYTHONQT_WITH_OPENGL
   PythonQtCore: include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri)
+  QT += opengl
 }
 
 PythonQtXml {
   DEFINES += PYTHONQT_WITH_XML
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
+  QT += xml
 }
 
 PythonQtXmlpatterns {
   DEFINES += PYTHONQT_WITH_XMLPATTERNS
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri)
+  QT += xmlpatterns
 }
 
 PythonQtMultimedia {
   DEFINES += PYTHONQT_WITH_MULTIMEDIA
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)
+ QT += multimedia multimediawidgets
 }
 
 PythonQtQml {
   DEFINES += PYTHONQT_WITH_QML
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_qml/com_trolltech_qt_qml.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_qml/com_trolltech_qt_qml.pri)
+  QT += qml
 }
 
 PythonQtQuick {
   DEFINES += PYTHONQT_WITH_QUICK
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_quick/com_trolltech_qt_quick.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_quick/com_trolltech_qt_quick.pri)
+  QT += quick quickwidgets
 }
 
 PythonQtUiTools {
   DEFINES += PYTHONQT_WITH_UITOOLS
-include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
+  include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
+  QT += uitools
 }
 
 PythonQtWebKit {
-  QT += webkit webkitwidgets
   DEFINES += PYTHONQT_WITH_WEBKIT
   include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
+  QT += webkit webkitwidgets
 }