diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-16 17:45:16 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-28 11:41:38 +0200 |
| commit | a7bb77288d28160daabbc00179e77736886ce8d2 (patch) | |
| tree | 04dcfc73f09e702e0597f9b1c8ff05313dc50f5c /src/plugins/qt4projectmanager/qt4buildconfiguration.h | |
| parent | 52a41ecb0c455b9979b2a55cc5f96b078b696996 (diff) | |
| download | qt-creator-a7bb77288d28160daabbc00179e77736886ce8d2.tar.gz | |
BC: Move builddirectory handling into BC itself
Use setBuildDirectory() in the different BuildConfigurations instead
of reimplementing that over and over again.
Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4buildconfiguration.h')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4buildconfiguration.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h index e39e82c8d4..b12dcaa132 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h @@ -45,6 +45,8 @@ class Qt4BuildConfigurationFactory; class Qt4ProFileNode; class BuildConfigurationInfo; +namespace Internal { class Qt4ProjectConfigWidget; } + class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration { Q_OBJECT @@ -55,10 +57,7 @@ public: ~Qt4BuildConfiguration(); ProjectExplorer::NamedWidget *createConfigWidget(); - QString buildDirectory() const; - QString rawBuildDirectory() const; bool isShadowBuild() const; - void setBuildDirectory(const QString &dir); void setSubNodeBuild(Qt4ProjectManager::Qt4ProFileNode *node); Qt4ProjectManager::Qt4ProFileNode *subNodeBuild() const; @@ -136,6 +135,7 @@ protected: private: void ctor(); QString defaultShadowBuildDirectory() const; + void setBuildDirectory(const Utils::FileName &directory); class LastKitState { @@ -155,11 +155,12 @@ private: bool m_shadowBuild; bool m_isEnabled; QString m_buildDirectory; - QString m_lastEmmitedBuildDirectory; bool m_qtVersionSupportsShadowBuilds; QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration; Qt4ProjectManager::Qt4ProFileNode *m_subNodeBuild; ProjectExplorer::FileNode *m_fileNodeBuild; + + friend class Internal::Qt4ProjectConfigWidget; }; class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory |