From 199b7ccb2a82e6a87808c3873c158ca38120dfdf Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 6 Aug 2010 18:17:22 +0200
Subject: fix loading of module configs

do it in qt_config.prf instead of in the autogenerated qconfig.pri
files. this is waaaay more elegant, and allows us to easily use the
magic in that file which avoids loading qt configuration from the qt
install dir while building qt itself.

Reviewed-by: joerg
Reviewed-by: Simon Hausmann
Task-number: QTBUG-12698
---
 configure                        |   3 ---
 configure.exe                    | Bin 1309696 -> 1320448 bytes
 mkspecs/features/qt_config.prf   |   1 +
 tools/configure/configureapp.cpp |   2 --
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure b/configure
index 25f1ef5..35fe2eb 100755
--- a/configure
+++ b/configure
@@ -7886,9 +7886,6 @@ QT_LIBINFIX = $QT_LIBINFIX
 QT_NAMESPACE = $QT_NAMESPACE
 QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
 
-#modules
-for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod)
-
 EOF
 if [ "$CFG_RPATH" = "yes" ]; then
     echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
diff --git a/configure.exe b/configure.exe
index 220e605..c5bff85 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index b6fba65..19e01a1 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -11,6 +11,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
    debug(1, "Cannot load qconfig.pri!")
 } else {
    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
+   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod)
 }
 
 load(qt_functions)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a0ca33a..0c716d1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2944,8 +2944,6 @@ void Configure::generateCachefile()
             configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl;
         }
 
-        configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl;
-
         configStream.flush();
         configFile.close();
     }
-- 
cgit v0.12