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

QmakeProjectManager: Don't add mkspec include dir explicitly

Browse Source 
It will be added via INCLUDE anyway.

This also removes all code using BaseQtVersion::systemHeaderPaths(),
which is thus also removed. This function was introduced to support
Symbian.

Change-Id: Id372e1cfc20bd22de948ed9a7d28dfa9135cbfa9
Task-number: QTCREATORBUG-13964
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-04-09 12:42:41 +02:00
parent f5e2e6d4f2
commit d1a7176f1c
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -507,22 +507,9 @@ void QmakeProject::updateCppCodeModel()
// part->defines // part->defines
templatePart->projectDefines += pro->cxxDefines(); templatePart->projectDefines += pro->cxxDefines();
// part->headerPaths
if (qtVersion) {
foreach (const HeaderPath &header, qtVersion->systemHeaderPathes(k)) {
ProjectPart::HeaderPath::Type type = ProjectPart::HeaderPath::IncludePath;
if (header.kind() == HeaderPath::FrameworkHeaderPath)
type = ProjectPart::HeaderPath::FrameworkPath;
templatePart->headerPaths += ProjectPart::HeaderPath(header.path(), type);
}
}
foreach (const QString &inc, pro->variableValue(IncludePathVar)) { foreach (const QString &inc, pro->variableValue(IncludePathVar)) {
const auto headerPath const auto headerPath
= ProjectPart::HeaderPath(inc, ProjectPart::HeaderPath::IncludePath); = ProjectPart::HeaderPath(inc, ProjectPart::HeaderPath::IncludePath);
// We've added header paths from qtVersion->systemHeaderPathes() above,
// which also contains the mkspecs dir. However, it's also part of
// the pro->variableValue(IncludePathVar), so check for duplicates.
if (!templatePart->headerPaths.contains(headerPath)) if (!templatePart->headerPaths.contains(headerPath))
templatePart->headerPaths += headerPath; templatePart->headerPaths += headerPath;
} }

8
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1183,14 +1183,6 @@ MacroExpander *BaseQtVersion::macroExpander() const
return &m_expander; return &m_expander;
} }
QList<HeaderPath> BaseQtVersion::systemHeaderPathes(const Kit *k) const
{
Q_UNUSED(k);
QList<HeaderPath> result;
result.append(HeaderPath(mkspecPath().toString(), HeaderPath::GlobalHeaderPath));
return result;
}
void BaseQtVersion::addToEnvironment(const Kit *k, Environment &env) const void BaseQtVersion::addToEnvironment(const Kit *k, Environment &env) const
{ {
Q_UNUSED(k); Q_UNUSED(k);

1
src/plugins/qtsupport/baseqtversion.h
View File

@@ -146,7 +146,6 @@ public:
bool hasDemos() const; bool hasDemos() const;
QString demosPath() const; QString demosPath() const;
virtual QList<ProjectExplorer::HeaderPath> systemHeaderPathes(const ProjectExplorer::Kit *k) const;
virtual QString frameworkInstallPath() const; virtual QString frameworkInstallPath() const;
// former local functions // former local functions