aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/runconfigurationaspects.h
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-05-27 09:10:16 +0200
committerhjk <hjk@theqtcompany.com>2015-05-27 09:58:43 +0000
commitcf1c8a06aa1f040645b8366c704487f366b27150 (patch)
tree204a6acb9882cb5d206309d6566b45b425a0da94 /src/plugins/projectexplorer/runconfigurationaspects.h
parent4aa51166946637eff89192a9146d5d335b8018e7 (diff)
ProjectExplorer: Fix connection lifetime in WorkingDirectory aspect
Also add some sanity checks before accessing related pointers. Change-Id: Ic9576ad3b28333210adc1187d4a0a26d52b0538e Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer/runconfigurationaspects.h')
-rw-r--r--src/plugins/projectexplorer/runconfigurationaspects.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index a619fd3fb7..5b44f33da5 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -95,14 +95,17 @@ public:
QString workingDirectory() const;
QString unexpandedWorkingDirectory() const;
void setWorkingDirectory(const QString &workingDirectory);
- Utils::PathChooser *pathChooser() const { return m_chooser; }
+ Utils::PathChooser *pathChooser() const;
private:
void fromMap(const QVariantMap &map) override;
void toMap(QVariantMap &map) const override;
+ void resetPath();
+ void updateEnvironment();
+
QString m_workingDirectory;
- Utils::PathChooser *m_chooser;
+ QPointer<Utils::PathChooser> m_chooser;
QString m_key;
};