diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 3a8af924bb9..ad39fa8f051 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -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; } diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index f4f2fb54573..70d1f096083 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -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 m_rawListEntries; - QStringList m_includePaths; QStringList m_projectIncludePaths; QByteArray m_defines;