diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-11 09:30:07 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-11 09:30:07 (GMT) |
| commit | 41a982bec324894e8a71d68a44f99b0a0d220a34 (patch) | |
| tree | be22c6993f1c8e4d5ac9f3bd9a0c5847548a9856 /tools | |
| parent | 62968f33452016b31020e524fa6ba6d2cefd0278 (diff) | |
| parent | a00dda686367807d6cc90f3cfca5453200565501 (diff) | |
| download | Qt-41a982bec324894e8a71d68a44f99b0a0d220a34.zip Qt-41a982bec324894e8a71d68a44f99b0a0d220a34.tar.gz Qt-41a982bec324894e8a71d68a44f99b0a0d220a34.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
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(); } |