diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-10 15:17:27 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-11 07:55:50 (GMT) |
| commit | 83795c1348f879d6742b4ef20b2315e0055e45a6 (patch) | |
| tree | ad29491635e7e7258f7997b24e791c1e60641999 | |
| parent | 0d4d065cc9757159c5b6fa817892f5707bc1ecae (diff) | |
| download | Qt-83795c1348f879d6742b4ef20b2315e0055e45a6.zip Qt-83795c1348f879d6742b4ef20b2315e0055e45a6.tar.gz Qt-83795c1348f879d6742b4ef20b2315e0055e45a6.tar.bz2 | |
configure.exe: don't write the QT_NAMESPACE define to .qmake.cache
Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the
QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the
QT_NAMESPACE=MyNamespace define for us.
Task-number: QTBUG-5221
Reviewed-by: ossi
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e27e16d..a0ca33a 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; |