Commit 00b22e40 authored by Eike Ziller's avatar Eike Ziller

QMake build step: Add missing error messages

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

Change-Id: Id39795219ec74591a78b8db4d0a381e072261f51
Reviewed-by: Riitta-Leena Miettinen's avatarLeena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent ba3f47e2
......@@ -192,8 +192,10 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration();
const BaseQtVersion *qtVersion = QtKitInformation::qtVersion(target()->kit());
if (!qtVersion)
if (!qtVersion) {
emit addOutput(tr("No Qt version configured."), BuildStep::OutputFormat::ErrorMessage);
return false;
}
QString workingDirectory;
......@@ -207,8 +209,12 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
m_runMakeQmake = (qtVersion->qtVersion() >= QtVersionNumber(5, 0 ,0));
if (m_runMakeQmake) {
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;
}
m_makeArguments = makeArguments();
} else {
m_makeExecutable.clear();
......
Markdown is supported
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