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

Qt4ProjectManager: Be more careful in detecing incompatible builds

Browse Source 
Task-Nr: QTCREATORBUG-4555

Reviewed-By: hunger
This commit is contained in:
dt
2011-04-19 19:24:30 +02:00
parent acd9e931e3
commit 1dbe498f86
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -1081,7 +1081,7 @@ BuildConfigurationInfo BuildConfigurationInfo::checkForBuild(const QString &dire
QString qmakeBinary = QtVersionManager::findQMakeBinaryFromMakefile(makefile);
if (qmakeBinary.isEmpty())
return BuildConfigurationInfo();
if (!QtVersionManager::makefileIsFor(makefile, proFilePath))
if (QtVersionManager::makefileIsFor(makefile, proFilePath) != QtVersionManager::SameProject)
return BuildConfigurationInfo();
bool temporaryQtVersion = false;