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

QMake build step: Add missing error messages

Browse Source 
Print error messages whenever initialization of the QMake build
step fails.

Change-Id: Id39795219ec74591a78b8db4d0a381e072261f51
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2017-02-20 12:27:37 +01:00
parent ba3f47e24a
commit 00b22e40fe
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -192,8 +192,10 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration(); QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration();
const BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit()); const BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit());
if (!qtVersion) if (!qtVersion) {
emit addOutput(tr("No Qt version configured."), BuildStep::OutputFormat::ErrorMessage);
return false; return false;
}
QString workingDirectory; QString workingDirectory;
@@ -207,8 +209,12 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
m_runMakeQmake = (qtVersion->qtVersion() >= QtVersionNumber(5, 0 ,0)); m_runMakeQmake = (qtVersion->qtVersion() >= QtVersionNumber(5, 0 ,0));
if (m_runMakeQmake) { if (m_runMakeQmake) {
m_makeExecutable = makeCommand(); m_makeExecutable = makeCommand();
if (m_makeExecutable.isEmpty()) if (m_makeExecutable.isEmpty()) {
emit addOutput(tr("Could not determine which \"make\" command to run. "
"Check the \"make\" step in the build configuration."),
BuildStep::OutputFormat::ErrorMessage);
return false; return false;
}
m_makeArguments = makeArguments(); m_makeArguments = makeArguments();
} else { } else {
m_makeExecutable.clear(); m_makeExecutable.clear();