summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/module.prf
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-03-13 15:53:10 +0100
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:40:00 +0200
commitf4b7e33c0b39b33542194b06d6268a841a55a469 (patch)
treecd57071cd04ef6c8128a02095bf9db0d20118a40 /mkspecs/features/module.prf
parent84fb7be6c15dd2c91693202b5eeb0f781ae7b31d (diff)
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>
Diffstat (limited to 'mkspecs/features/module.prf')
-rw-r--r--mkspecs/features/module.prf8
1 files changed, 1 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.")