summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/module.prf8
-rw-r--r--mkspecs/features/qt_installs.prf10
-rw-r--r--mkspecs/features/qt_module_config.prf1
3 files changed, 12 insertions, 7 deletions
diff --git a/mkspecs/features/module.prf b/mkspecs/features/module.prf
index d95c7a418d..699277d961 100644
--- 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.")
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 45c0957a49..c2f7fa501f 100644
--- 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.")
+ }
+}
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index ff1fc4bcf2..60bbe8d1bc 100644
--- 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++* {