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

QMake: Fix crash when removing Qt version from kit

Browse Source 
Fix crash when removing Qt version from kit while a qmake project
is open.

Task-number: QTCREATORBUG-16760
Change-Id: I697eceb6b165985ae9a225e79bf1205947300954
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-22 15:07:36 +02:00
parent 46191b2e86
commit c55db42c28
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,7 @@ QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
/// user arguments /// user arguments
QString QMakeStep::allArguments(const BaseQtVersion *v, bool shorted) const QString QMakeStep::allArguments(const BaseQtVersion *v, bool shorted) const
{ {
QTC_ASSERT(v, return QString());
QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
QStringList arguments; QStringList arguments;
if (bc->subNodeBuild()) if (bc->subNodeBuild())
@@ -482,9 +483,12 @@ QString QMakeStep::effectiveQMakeCall() const
if (make.isEmpty()) if (make.isEmpty())
make = tr("<no Make step found>"); make = tr("<no Make step found>");
QString result = qmake + QLatin1Char(' ') + allArguments(qtVersion); QString result = qmake;
if (qtVersion) {
result += QLatin1Char(' ') + allArguments(qtVersion);
if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0)) if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0))
result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments())); result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments()));
}
return result; return result;
} }