diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 08:59:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 08:59:19 (GMT) |
| commit | a00dda686367807d6cc90f3cfca5453200565501 (patch) | |
| tree | 3828f949f1c44d89f400b0edf23bc3c0ceb5fec2 /tools | |
| parent | 176852d24835dc5a14efa94ffe2a0ba58151fd4c (diff) | |
| parent | 199b7ccb2a82e6a87808c3873c158ca38120dfdf (diff) | |
| download | Qt-a00dda686367807d6cc90f3cfca5453200565501.zip Qt-a00dda686367807d6cc90f3cfca5453200565501.tar.gz Qt-a00dda686367807d6cc90f3cfca5453200565501.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix loading of module configs
don't load modules from qt.prf
add comment explaining why this file does magic instead of just voodoo
configure.exe: don't write the QT_NAMESPACE define to .qmake.cache
Don't build bearercloud example if Qt was build w/o SVG support
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e27e16d..0c716d1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -988,7 +988,6 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i); dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i); } else if (configCmdLine.at(i) == "-qtlibinfix") { ++i; @@ -2945,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(); } |