diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-10 15:17:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-01 06:40:01 (GMT) |
| commit | 84c17ecd68271e6e800cbdc5779646b0244a9137 (patch) | |
| tree | 5c07e2672a47ded2b5cb26ae7c5f80a728f193a7 | |
| parent | 50f9352059909217d19d7c2be3cfee4637bf8d11 (diff) | |
| download | Qt-84c17ecd68271e6e800cbdc5779646b0244a9137.zip Qt-84c17ecd68271e6e800cbdc5779646b0244a9137.tar.gz Qt-84c17ecd68271e6e800cbdc5779646b0244a9137.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
(cherry picked from commit 83795c1348f879d6742b4ef20b2315e0055e45a6)
| -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 f7dac93..11f65d4 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; |