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>

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index b9fa75d..f5fa3e5 100644 (file)
--- 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)" \