From 28c23cdd08c3d6d9f8440047a15efcd865fa4a8c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 23 Jul 2010 16:39:26 +0200
Subject: Make it possible for Qt modules to extend QT_CONFIG

This is done by reading the module files from within qconfig.pri.

Task-number: QTBUG-12379
Rubber-stamped-by: Joerg Bornemann
Rubber-stamped-by: Marius Storm-Olsen
---
 configure                        | 3 +++
 tools/configure/configureapp.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/configure b/configure
index aa48c84..de67ed1 100755
--- a/configure
+++ b/configure
@@ -7864,6 +7864,9 @@ 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/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index f7dac93..b7de052 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2925,6 +2925,8 @@ 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