diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-13 15:53:10 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:40:00 +0200 |
| commit | f4b7e33c0b39b33542194b06d6268a841a55a469 (patch) | |
| tree | cd57071cd04ef6c8128a02095bf9db0d20118a40 /mkspecs | |
| parent | 84fb7be6c15dd2c91693202b5eeb0f781ae7b31d (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')
| -rw-r--r-- | mkspecs/features/module.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/qt_installs.prf | 10 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 1 |
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++* { |