From a4e213b775d41f5184d1543fae6a3a794595e6b5 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Mon, 14 Nov 2016 14:18:15 +0100
Subject: [PATCH] ProjectExplorer: Avoid accessing nullptr for unconfigured
 projects

Task-number: QTCREATORBUG-17256
Change-Id: I586c7267cbb4f9f16134c1be08aa4a738e990e80
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/projectexplorer/projectimporter.h | 2 +-
 src/plugins/projectexplorer/targetsetuppage.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h
index 50d98b275a6..62d1350559e 100644
--- a/src/plugins/projectexplorer/projectimporter.h
+++ b/src/plugins/projectexplorer/projectimporter.h
@@ -39,7 +39,7 @@ class Project;
 class Target;
 
 // Documentation inside.
-class PROJECTEXPLORER_EXPORT ProjectImporter
+class PROJECTEXPLORER_EXPORT ProjectImporter : public QObject
 {
 public:
     ProjectImporter(const QString &path);
diff --git a/src/plugins/projectexplorer/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h
index d004143634b..8f589506294 100644
--- a/src/plugins/projectexplorer/targetsetuppage.h
+++ b/src/plugins/projectexplorer/targetsetuppage.h
@@ -32,6 +32,7 @@
 
 #include <utils/wizardpage.h>
 
+#include <QPointer>
 #include <QString>
 #include <QMap>
 
@@ -109,7 +110,7 @@ private:
 
     KitMatcher m_requiredMatcher;
     KitMatcher m_preferredMatcher;
-    ProjectImporter *m_importer = nullptr;
+    QPointer<ProjectImporter> m_importer = nullptr;
     QLayout *m_baseLayout = nullptr;
     QString m_projectPath;
     QString m_defaultShadowBuildLocation;