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

Fix crash in QMakeStep::allArguments

Browse Source 
qtVersion can be null now
This commit is contained in:
dt
2011-05-16 12:18:07 +02:00
parent e3158d0e99
commit 9dea7a397b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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