From 9e5ccb44840ab1ab6f38e3224f59a5a0c9dab568 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 5 May 2009 10:17:32 +0200
Subject: [PATCH] Compile
---
src/plugins/qt4projectmanager/qt4project.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 87a75f31bf3..f0f80fe50ec 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -504,6 +504,12 @@ void Qt4Project::updateCodeModel()
predefinedIncludePaths.append(info.absoluteFilePath());
}
+ FindQt4ProFiles findQt4ProFiles;
+ QList<Qt4ProFileNode *> proFiles = findQt4ProFiles(rootProjectNode());
+ QByteArray definedMacros = predefinedMacros;
+ QStringList allIncludePaths = predefinedIncludePaths;
+ QStringList allFrameworkPaths = predefinedFrameworkPaths;
+
#ifdef Q_OS_MAC
allFrameworkPaths.append(newQtLibsPath);
// put QtXXX.framework/Headers directories in include path since that qmake's behavior
@@ -515,12 +521,6 @@ void Qt4Project::updateCodeModel()
}
#endif
- FindQt4ProFiles findQt4ProFiles;
- QList<Qt4ProFileNode *> proFiles = findQt4ProFiles(rootProjectNode());
- QByteArray definedMacros = predefinedMacros;
- QStringList allIncludePaths = predefinedIncludePaths;
- QStringList allFrameworkPaths = predefinedFrameworkPaths;
-
foreach (Qt4ProFileNode *pro, proFiles) {
Internal::CodeModelInfo info;
info.defines = predefinedMacros;
--
GitLab