feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Take QMAKE_CXXFLAGS into account for additional INCLUDEPATHS

Browse Source 
This also fixes pkg-config support for the code model.

Task-Nr: QTCREATORBUG-976
This commit is contained in:
dt
2010-03-29 17:11:26 +02:00
parent ee091aa9c8
commit 663b166732
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1349,9 +1349,14 @@ QStringList Qt4ProFileNode::mocDirPaths(ProFileReader *reader) const
QStringList Qt4ProFileNode::includePaths(ProFileReader *reader) const QStringList Qt4ProFileNode::includePaths(ProFileReader *reader) const
{ {
QStringList paths; QStringList paths;
paths = reader->absolutePathValues(QLatin1String("INCLUDEPATH"), foreach (const QString &cxxflags, m_readerExact->values("QMAKE_CXXFLAGS")) {
m_projectDir); if (cxxflags.startsWith("-I"))
paths << uiDirPaths(reader) << mocDirPaths(reader); paths.append(cxxflags.mid(2));
}
paths.append(reader->absolutePathValues(QLatin1String("INCLUDEPATH"), m_projectDir));
paths << mocDirPaths(reader) << uiDirPaths(reader);
paths.removeDuplicates(); paths.removeDuplicates();
return paths; return paths;
} }