From 663b16673222e46afdb631e44ec2a04cb884878d Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 29 Mar 2010 17:11:26 +0200
Subject: [PATCH] Take QMAKE_CXXFLAGS into account for additional INCLUDEPATHS
This also fixes pkg-config support for the code model.
Task-Nr: QTCREATORBUG-976
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 5181329c146..e0b49902c0b 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1349,9 +1349,14 @@ QStringList Qt4ProFileNode::mocDirPaths(ProFileReader *reader) const
QStringList Qt4ProFileNode::includePaths(ProFileReader *reader) const
{
QStringList paths;
- paths = reader->absolutePathValues(QLatin1String("INCLUDEPATH"),
- m_projectDir);
- paths << uiDirPaths(reader) << mocDirPaths(reader);
+ foreach (const QString &cxxflags, m_readerExact->values("QMAKE_CXXFLAGS")) {
+ if (cxxflags.startsWith("-I"))
+ paths.append(cxxflags.mid(2));
+ }
+
+ paths.append(reader->absolutePathValues(QLatin1String("INCLUDEPATH"), m_projectDir));
+ paths << mocDirPaths(reader) << uiDirPaths(reader);
+
paths.removeDuplicates();
return paths;
}
--
GitLab