diff options
| author | dt <qtc-committer@nokia.com> | 2009-08-21 18:00:57 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-08-24 10:16:22 +0200 |
| commit | dfdbe06dfa83e25dc7b39cc11e5c6486a6b94657 (patch) | |
| tree | 9a007eb52d9677b6ddebb190920707e47d24880e | |
| parent | 757c1cc1bd18a739ec86a7c84de3a2016f7fa245 (diff) | |
Fix worngly aggregating all DEFINES from all .pro files.
(cherry picked from commit b3ad912d7c759197e85d3e1ad7c3bff6f6ce8e41)
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index bf1d59b90c..b558b8770c 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -594,7 +594,7 @@ void Qt4Project::updateCodeModel() pinfo.defines = predefinedMacros; - pinfo.defines += definedMacros; // ### FIXME: me + // pinfo.defines += definedMacros; // ### FIXME: me pinfo.includePaths = allIncludePaths; pinfo.frameworkPaths = allFrameworkPaths; pinfo.sourceFiles = files; |