make qt_module_config.prf install the module pri file

absorb module.prf into qt_installs.prf, as that's where it belongs. add qt_install_module option and automatically set it in qt_module_config. make qt_installs use that option. Change-Id: I860616f3a29a456f7b88ddaffa09375400c8911e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-13 15:53:10 +01:00 · 2012-03-13 15:53:10 +01:00 · f4b7e33c0b
commit f4b7e33c0b
parent 84fb7be6c1
15 changed files with 17 additions and 19 deletions
--- a/mkspecs/features/module.prf
+++ b/mkspecs/features/module.prf
@ -1,7 +1 @@
-!isEmpty(MODULE_PRI) {
-    pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
-    pritarget.files = $$MODULE_PRI
-    INSTALLS += pritarget
-} else {
-    warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects")
-}
+warning("CONFIG+=module is obsolete. load(qt_module_config) is sufficient.")
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@ -39,3 +39,13 @@ qt_install_headers {
    INSTALLS += qpa_headers
 }

+#module
+qt_install_module {
+    !isEmpty(MODULE_PRI) {
+        pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
+        pritarget.files = $$MODULE_PRI
+        INSTALLS += pritarget
+    } else {
+        warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.")
+    }
+}
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@ -109,6 +109,7 @@ aix-g++* {
 !static:PRL_EXPORT_DEFINES += QT_SHARED

 #install directives
+CONFIG += qt_install_module
 load(qt_installs)

 unix|win32-g++* {
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@ -3,8 +3,8 @@ load(qt_module)
 TARGET     = QtConcurrent
 QPRO_PWD   = $$PWD
 QT         = core-private
+CONFIG    += exceptions

-CONFIG += module exceptions
 MODULE_PRI = ../modules/qt_concurrent.pri

 DEFINES   += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@ -3,8 +3,8 @@ load(qt_module)
 TARGET	   = QtCore
 QPRO_PWD   = $$PWD
 QT         =
+CONFIG    += moc resources exceptions

-CONFIG += module moc resources exceptions
 MODULE = core     # not corelib, as per project file
 MODULE_PRI = ../modules/qt_core.pri

--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@ -3,8 +3,8 @@ load(qt_module)
 TARGET = QtDBus
 QPRO_PWD = $$PWD
 QT = core-private
+CONFIG += link_pkgconfig

-CONFIG += link_pkgconfig module
 MODULE_PRI = ../modules/qt_dbus.pri

 DEFINES += QT_BUILD_DBUS_LIB \
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@ -4,7 +4,6 @@ TARGET     = QtGui
 QPRO_PWD   = $$PWD
 QT = core-private

-CONFIG += module
 MODULE_PRI = ../modules/qt_gui.pri

 DEFINES   += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
--- a/src/network/network.pro
+++ b/src/network/network.pro
@ -4,7 +4,6 @@ load(qt_module)
 TARGET   = QtNetwork
 QPRO_PWD = $$PWD

-CONFIG += module
 MODULE_PRI = ../modules/qt_network.pri

 DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@ -4,7 +4,6 @@ TARGET     = QtOpenGL
 QPRO_PWD   = $$PWD
 QT         = core-private gui-private widgets-private

-CONFIG += module
 MODULE_PRI = ../modules/qt_opengl.pri

 DEFINES   += QT_BUILD_OPENGL_LIB
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@ -5,7 +5,6 @@ QT         += core-private gui-private
 TEMPLATE   = lib
 DESTDIR    = $$QT.gui.libs

-CONFIG += module
 CONFIG += staticlib
 mac:LIBS += -lz -framework CoreFoundation -framework Carbon

--- a/src/printsupport/printsupport.pro
+++ b/src/printsupport/printsupport.pro
@ -4,7 +4,6 @@ TARGET     = QtPrintSupport
 QPRO_PWD   = $$PWD
 QT = core-private gui-private widgets-private

-CONFIG += module
 MODULE_PRI = ../modules/qt_printsupport.pri

 DEFINES   += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@ -4,7 +4,6 @@ TARGET	   = QtSql
 QPRO_PWD   = $$PWD
 QT         = core-private

-CONFIG += module
 MODULE_PRI = ../modules/qt_sql.pri

 DEFINES += QT_BUILD_SQL_LIB
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@ -3,8 +3,8 @@ load(qt_module)
 TARGET = QtTest
 QPRO_PWD = $$PWD
 QT = core-private
+CONFIG += exceptions

-CONFIG += module exceptions
 MODULE_PRI = ../modules/qt_testlib.pri

 INCLUDEPATH += .
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@ -3,8 +3,8 @@ load(qt_module)
 TARGET     = QtWidgets
 QPRO_PWD   = $$PWD
 QT = core core-private gui gui-private platformsupport-private
+CONFIG += uic

-CONFIG += module uic
 MODULE_PRI = ../modules/qt_widgets.pri

 DEFINES   += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@ -4,7 +4,6 @@ TARGET     = QtXml
 QPRO_PWD   = $$PWD
 QT         = core-private

-CONFIG += module
 MODULE_PRI = ../modules/qt_xml.pri

 DEFINES   += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE