Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  Dummy commit to make the CI test again
  Fix quoting for module reading in qconfig.pri

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index de67ed1..ffd38d0 100755
--- a/configure
+++ b/configure
@@ -7865,7 +7865,7 @@ QT_NAMESPACE = $QT_NAMESPACE
 QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
 
 #modules
-for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)
+for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod)
 
 EOF
 if [ "$CFG_RPATH" = "yes" ]; then