aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-05-04 12:16:38 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-05-16 07:19:22 +0000
commit6754514489f97550888b7939135b62c4aefffd10 (patch)
tree7dfce0c9892924d01f6bc93b6c1894c18765fb0b /src/plugins/qbsprojectmanager/qbsrunconfiguration.h
parent4dac9c40bb1b07da8e3c1075d8bd7fa6bba9a829 (diff)
QbsProjectManager: Re-introduce install step
... in a modified variant. The install root is now taken from the build step to ensure consistency. A dedicated deploy step can be useful on Windows if one wants to rebuild while the application is running. Task-number: QTCREATORBUG-17958 Change-Id: I93bc59b0e6d954d61d84bcfc81576cdb4fac1216 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsrunconfiguration.h')
-rw-r--r--src/plugins/qbsprojectmanager/qbsrunconfiguration.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
index 92273e5f4e..45b4c3b830 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
@@ -50,6 +50,7 @@ class QbsProject;
namespace Internal {
+class QbsInstallStep;
class QbsRunConfigurationFactory;
class QbsRunConfiguration : public ProjectExplorer::RunConfiguration
@@ -86,6 +87,7 @@ protected:
private:
void installStepChanged();
+ void installStepToBeRemoved(int pos);
QString baseWorkingDirectory() const;
QString defaultDisplayName();
@@ -95,8 +97,7 @@ private:
QString m_uniqueProductName;
- // Cached startup sub project information
-
+ QbsInstallStep *m_currentInstallStep; // We do not take ownership!
ProjectExplorer::BuildStepList *m_currentBuildStepList; // We do not take ownership!
};