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

QmakeProject: Don't crash on project import

Browse Source 
Amends fc1fc6a07a.

Fixes: QTCREATORBUG-24802
Change-Id: I62e7e0bab82ae1b025c053785b77586aa78bcd1f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-10-26 10:19:08 +01:00
parent 20a6207459
commit 045881089f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,6 +614,7 @@ void QMakeStep::userArgumentsChanged()
{ {
if (m_ignoreChange) if (m_ignoreChange)
return; return;
if (qmakeAdditonalArgumentsLineEdit)
qmakeAdditonalArgumentsLineEdit->setText(m_userArgs); qmakeAdditonalArgumentsLineEdit->setText(m_userArgs);
updateAbiWidgets(); updateAbiWidgets();
updateEffectiveQMakeCall(); updateEffectiveQMakeCall();
@@ -723,6 +724,9 @@ bool QMakeStep::isAndroidKit() const
void QMakeStep::updateAbiWidgets() void QMakeStep::updateAbiWidgets()
{ {
if (!abisLabel)
return;
BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit()); BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit());
if (!qtVersion) if (!qtVersion)
return; return;
@@ -762,6 +766,7 @@ void QMakeStep::updateAbiWidgets()
void QMakeStep::updateEffectiveQMakeCall() void QMakeStep::updateEffectiveQMakeCall()
{ {
if (qmakeArgumentsEdit)
qmakeArgumentsEdit->setPlainText(effectiveQMakeCall()); qmakeArgumentsEdit->setPlainText(effectiveQMakeCall());
} }