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

QmakeProject: Show a better error message than just "Incompatible build"

Browse Source 
Change-Id: I003e856dd5b222348bacd5acbdf9da4725864b35
Task-number: QTCREATORBUG-14021
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-07-24 15:21:00 +02:00
parent 9e25fa9a66
commit 780e70b757
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
View File

@@ -213,6 +213,7 @@ void QmakeProjectConfigWidget::updateProblemLabel()
bool incompatibleBuild = false;
bool allGood = false;
// we only show if we actually have a qmake and makestep
QString errorString;
if (m_buildConfiguration->qmakeStep() && m_buildConfiguration->makeStep()) {
QString makefile = m_buildConfiguration->buildDirectory().toString() + QLatin1Char('/');
if (m_buildConfiguration->makefile().isEmpty())
@@ -220,7 +221,7 @@ void QmakeProjectConfigWidget::updateProblemLabel()
else
makefile.append(m_buildConfiguration->makefile());
switch (m_buildConfiguration->compareToImportFrom(makefile)) {
switch (m_buildConfiguration->compareToImportFrom(makefile, &errorString)) {
case QmakeBuildConfiguration::MakefileMatches:
allGood = true;
break;
@@ -274,8 +275,9 @@ void QmakeProjectConfigWidget::updateProblemLabel()
.arg(m_buildConfiguration->buildDirectory().toUserOutput()));
return;
} else if (incompatibleBuild) {
setProblemLabel(tr("An incompatible build exists in %1, which will be overwritten.",
"%1 build directory")
setProblemLabel(tr("%1 The build in %2 will be overwritten.",
"%1 error message, %2 build directory")
.arg(errorString)
.arg(m_buildConfiguration->buildDirectory().toUserOutput()));
return;
}