Commit 9dea7a39 authored by dt's avatar dt
Browse files

Fix crash in QMakeStep::allArguments

qtVersion can be null now
parent e3158d0e
......@@ -137,10 +137,14 @@ QString QMakeStep::allArguments(bool shorted)
if (!haveSpec) {
const QString tcSpec = bc->toolChain() ? bc->toolChain()->mkspec() : QString();
if (!tcSpec.isEmpty() && bc->qtVersion()->hasMkspec(tcSpec))
if (tcSpec.isEmpty()) {
if (bc->qtVersion())
arguments << "-spec" << bc->qtVersion()->mkspec();
} else if (!bc->qtVersion() || bc->qtVersion()->hasMkspec(tcSpec)) {
arguments << "-spec" << tcSpec;
else
} else {
arguments << "-spec" << bc->qtVersion()->mkspec();
}
}
// Find out what flags we pass on to qmake
......
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