diff options
| author | dt <[email protected]> | 2011-03-10 13:48:49 +0100 |
|---|---|---|
| committer | dt <[email protected]> | 2011-03-10 13:51:08 +0100 |
| commit | ffd6d307a07364422a35e70af4f48f5d4b21bccb (patch) | |
| tree | 3de1fe12aafb4bd62178d0b38a03bd5e215ddeb7 /src/plugins/cmakeprojectmanager/cmakeproject.cpp | |
| parent | 53298420edcbc87695c833e2017d46c20b18be2e (diff) | |
CMakeProject: Better order of include directories
Project directories should come before system directories.
Task-Nr: QTCREATORBUG-3959
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 6819fbbb0ae..00d74d8e012 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -285,7 +285,11 @@ bool CMakeProject::parseCMakeLists() if (!activeBC->toolChain()) return true; - QStringList allIncludePaths; + QStringList allIncludePaths; + // This explicitly adds -I. to the include paths + allIncludePaths.append(projectDirectory()); + allIncludePaths.append(cbpparser.includeFiles()); + QStringList allFrameworkPaths; QList<ProjectExplorer::HeaderPath> allHeaderPaths = activeBC->toolChain()->systemHeaderPaths(); foreach (const ProjectExplorer::HeaderPath &headerPath, allHeaderPaths) { @@ -294,10 +298,7 @@ bool CMakeProject::parseCMakeLists() else allIncludePaths.append(headerPath.path()); } - // This explicitly adds -I. to the include paths - allIncludePaths.append(projectDirectory()); - allIncludePaths.append(cbpparser.includeFiles()); CPlusPlus::CppModelManagerInterface *modelmanager = CPlusPlus::CppModelManagerInterface::instance(); if (modelmanager) { |