diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-30 13:46:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-31 16:10:25 +0200 |
| commit | 0a0157f5459ba61b5978fea90cad486757da3590 (patch) | |
| tree | ce3b48fc686bca2fe834cf483203cfe85418a817 /mkspecs | |
| parent | 9ca74072d7c16518a69a2365ae3527d8bbb891a5 (diff) | |
Move the creation of the MODULE_DEFINES variable above the pri file check.
The MODULE_DEFINES is also used by create_cmake.prf, whether there is an existing
pri file or not. In the case of QtWebKit at least, there is still a handwritten
pri file present.
Change-Id: I566c32a36aa6b84a455c2785c0da2bae57ea9091
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index b9fa75d0f5..f5fa3e5da7 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -25,6 +25,12 @@ ucmodule = $$upper($$MODULE) MODULE_DEPENDS = $$replace(QT, -private$, ) +contains(TARGET, QtAddOn.*): \ + MODULE_DEFINE = QT_ADDON_$${ucmodule}_LIB +else: \ + MODULE_DEFINE = QT_$${ucmodule}_LIB +MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES + # Find the module's source root dir. MODULE_PROFILE_DIR = $$_PRO_FILE_PWD_ for(ever) { @@ -67,11 +73,6 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri module_config = "QT.$${MODULE}.CONFIG = $$MODULE_CONFIG" else: \ module_config = - contains(TARGET, QtAddOn.*): \ - MODULE_DEFINE = QT_ADDON_$${ucmodule}_LIB - else: \ - MODULE_DEFINE = QT_$${ucmodule}_LIB - MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES MODULE_PRI_CONT = \ "QT.$${MODULE}.VERSION = $${VERSION}" \ "QT.$${MODULE}.MAJOR_VERSION = $$section(VERSION, ., 0, 0)" \ |