summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-07-23 14:39:26 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-07-23 14:39:26 (GMT)
commit28c23cdd08c3d6d9f8440047a15efcd865fa4a8c (patch)
tree4f6ccaad8e6cf3ebbf4f6c6d8de5188f01e1585f /configure
parentb401ad3ad0448a9893d1d383ad47769ebc9025ff (diff)
downloadQt-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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
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"