Commit 70cecb52 authored by Fawzi Mohamed's avatar Fawzi Mohamed
Browse files

qmakeprojectmanager: check .pro file when building



A .pro file mismatch between the generated Makefile and what
should be generated was checked only at import.
Always check that (ant thus warn ifs one ends up in that situation)

Change-Id: I73436845ec82d6598ab13f446c655b644c0e6b3f
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent a8ea0a07
...@@ -341,6 +341,14 @@ QmakeBuildConfiguration::MakefileState QmakeBuildConfiguration::compareToImportF ...@@ -341,6 +341,14 @@ QmakeBuildConfiguration::MakefileState QmakeBuildConfiguration::compareToImportF
BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit());
if (!version) if (!version)
return MakefileForWrongProject; return MakefileForWrongProject;
if (QtSupport::QtVersionManager::makefileIsFor(makefile, qs->project()->projectFilePath())
!= QtSupport::QtVersionManager::SameProject) {
if (debug) {
qDebug() << "different profile used to generate the Makefile:"
<< makefile << " expected profile:" << qs->project()->projectFilePath();
}
return MakefileIncompatible;
}
if (version->qmakeCommand() == qmakePath) { if (version->qmakeCommand() == qmakePath) {
// same qtversion // same qtversion
QPair<BaseQtVersion::QmakeBuildConfigs, QString> result = QPair<BaseQtVersion::QmakeBuildConfigs, QString> result =
......
Supports Markdown
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