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

ProjectExplorer: Avoid accessing nullptr for unconfigured projects

Browse Source 
Task-number: QTCREATORBUG-17256
Change-Id: I586c7267cbb4f9f16134c1be08aa4a738e990e80
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2016-11-14 14:18:15 +01:00
parent e4e1bdb27a
commit a4e213b775
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectimporter.h
View File

@@ -39,7 +39,7 @@ class Project;
class Target; class Target;
// Documentation inside. // Documentation inside.
class PROJECTEXPLORER_EXPORT ProjectImporter class PROJECTEXPLORER_EXPORT ProjectImporter : public QObject
{ {
public: public:
ProjectImporter(const QString &path); ProjectImporter(const QString &path);

3
src/plugins/projectexplorer/targetsetuppage.h
View File

@@ -32,6 +32,7 @@
#include <utils/wizardpage.h> #include <utils/wizardpage.h>
#include <QPointer>
#include <QString> #include <QString>
#include <QMap> #include <QMap>
@@ -109,7 +110,7 @@ private:
KitMatcher m_requiredMatcher; KitMatcher m_requiredMatcher;
KitMatcher m_preferredMatcher; KitMatcher m_preferredMatcher;
ProjectImporter *m_importer = nullptr; QPointer<ProjectImporter> m_importer = nullptr;
QLayout *m_baseLayout = nullptr; QLayout *m_baseLayout = nullptr;
QString m_projectPath; QString m_projectPath;
QString m_defaultShadowBuildLocation; QString m_defaultShadowBuildLocation;