From 9dea7a397bbed224eb3bc36edfa9c467c0af46e7 Mon Sep 17 00:00:00 2001 From: dt Date: Mon, 16 May 2011 12:18:07 +0200 Subject: [PATCH] Fix crash in QMakeStep::allArguments qtVersion can be null now --- src/plugins/qt4projectmanager/qmakestep.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index ca27219f0c2..e69cfdcfb14 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -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