diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-23 14:39:26 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-23 14:39:26 (GMT) |
| commit | 28c23cdd08c3d6d9f8440047a15efcd865fa4a8c (patch) | |
| tree | 4f6ccaad8e6cf3ebbf4f6c6d8de5188f01e1585f | |
| parent | b401ad3ad0448a9893d1d383ad47769ebc9025ff (diff) | |
| download | Qt-28c23cdd08c3d6d9f8440047a15efcd865fa4a8c.zip Qt-28c23cdd08c3d6d9f8440047a15efcd865fa4a8c.tar.gz Qt-28c23cdd08c3d6d9f8440047a15efcd865fa4a8c.tar.bz2 | |
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
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -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(); } |