diff options
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 5a0e96a369..1363bef7b6 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -65,7 +65,7 @@ namespace CppTools { uint qHash(const ProjectPart &p) { uint h = qHash(p.toolchainDefines) ^ qHash(p.projectDefines) ^ p.cVersion ^ p.cxxVersion - ^ p.cxxExtensions ^ p.qtVersion; + ^ p.cxxExtensions ^ p.qtVersion ^ qHash(p.projectConfigFile); foreach (const QString &i, p.includePaths) h ^= qHash(i); @@ -83,6 +83,8 @@ bool operator==(const ProjectPart &p1, return false; if (p1.projectDefines != p2.projectDefines) return false; + if (p1.projectConfigFile != p2.projectConfigFile) + return false; if (p1.cVersion != p2.cVersion) return false; if (p1.cxxVersion != p2.cxxVersion) @@ -393,6 +395,8 @@ QByteArray CppModelManager::internalDefinedMacros() const foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) { addUnique(part->toolchainDefines.split('\n'), ¯os, &alreadyIn); addUnique(part->projectDefines.split('\n'), ¯os, &alreadyIn); + if (!part->projectConfigFile.isEmpty()) + macros += readProjectConfigFile(part); } } return macros; @@ -434,6 +438,7 @@ void CppModelManager::dumpModelManagerConfiguration() qDebug() << "cxxVersion:" << cxxVersion; qDebug() << "cxxExtensions:" << cxxExtensions; qDebug() << "Qt version:" << part->qtVersion; + qDebug() << "project config file:" << part->projectConfigFile; qDebug() << "precompiled header:" << part->precompiledHeaders; qDebug() << "toolchain defines:" << part->toolchainDefines; qDebug() << "project defines:" << part->projectDefines; |