From 045881089f10b45715f9a9eb752a805670c649a1 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 26 Oct 2020 10:19:08 +0100
Subject: [PATCH] QmakeProject: Don't crash on project import

Amends fc1fc6a07af58f.

Fixes: QTCREATORBUG-24802
Change-Id: I62e7e0bab82ae1b025c053785b77586aa78bcd1f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/qmakeprojectmanager/qmakestep.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 620b3645f70..1f1d1bae4b6 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -614,7 +614,8 @@ void QMakeStep::userArgumentsChanged()
 {
     if (m_ignoreChange)
         return;
-    qmakeAdditonalArgumentsLineEdit->setText(m_userArgs);
+    if (qmakeAdditonalArgumentsLineEdit)
+        qmakeAdditonalArgumentsLineEdit->setText(m_userArgs);
     updateAbiWidgets();
     updateEffectiveQMakeCall();
 }
@@ -723,6 +724,9 @@ bool QMakeStep::isAndroidKit() const
 
 void QMakeStep::updateAbiWidgets()
 {
+    if (!abisLabel)
+        return;
+
     BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit());
     if (!qtVersion)
         return;
@@ -762,7 +766,8 @@ void QMakeStep::updateAbiWidgets()
 
 void QMakeStep::updateEffectiveQMakeCall()
 {
-    qmakeArgumentsEdit->setPlainText(effectiveQMakeCall());
+    if (qmakeArgumentsEdit)
+        qmakeArgumentsEdit->setPlainText(effectiveQMakeCall());
 }
 
 void QMakeStep::recompileMessageBoxFinished(int button)