Commit 26b989b0 authored by Daniel Teske's avatar Daniel Teske
Browse files

GenericProject: Simnplfy code handling includes



Change-Id: I42ee45920907d3d55a3adf77901b37fbf45bb70b
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent f18eb672
......@@ -254,7 +254,7 @@ void GenericProject::refresh(RefreshOptions options)
part->displayName = displayName();
part->projectFile = projectFilePath();
part->includePaths += allIncludePaths();
part->includePaths += projectIncludePaths();
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::defaultKit();
if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
......@@ -337,15 +337,6 @@ QStringList GenericProject::processEntries(const QStringList &paths,
return absolutePaths;
}
QStringList GenericProject::allIncludePaths() const
{
QStringList paths;
paths += m_includePaths;
paths += m_projectIncludePaths;
paths.removeDuplicates();
return paths;
}
QStringList GenericProject::projectIncludePaths() const
{
return m_projectIncludePaths;
......@@ -356,16 +347,6 @@ QStringList GenericProject::files() const
return m_files;
}
QStringList GenericProject::includePaths() const
{
return m_includePaths;
}
void GenericProject::setIncludePaths(const QStringList &includePaths)
{
m_includePaths = includePaths;
}
QByteArray GenericProject::defines() const
{
return m_defines;
......@@ -430,8 +411,6 @@ bool GenericProject::fromMap(const QVariantMap &map)
t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
}
setIncludePaths(allIncludePaths());
refresh(Everything);
return true;
}
......
......@@ -86,7 +86,6 @@ public:
void setIncludePaths(const QStringList &includePaths);
QByteArray defines() const;
QStringList allIncludePaths() const;
QStringList projectIncludePaths() const;
QStringList files() const;
......@@ -112,7 +111,6 @@ private:
QStringList m_rawFileList;
QStringList m_files;
QHash<QString, QString> m_rawListEntries;
QStringList m_includePaths;
QStringList m_projectIncludePaths;
QByteArray m_defines;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment