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

ProjectExplorer: Set up hack to funnel information to buildstep ctors

Browse Source 
For now, store most of BuildInfo in the BuildConfiguration. This will
allow accessing it in the BuildStep ctors so the BuildSteps can
be fully setup without polishing afterwards (as currently done
in the main build steps of the three buildsystems, and Nim)

This in meant to be temporary to a large degree.

Change-Id: If6ade6052f4b96670995399ae97ef7d2313f632a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-02 18:06:29 +02:00
parent 02707ecdad
commit fb631cb258
16 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -86,7 +86,12 @@ public:
Profile,
Release
};
virtual BuildType buildType() const = 0;
virtual BuildType buildType() const { return m_initialBuildType; }
BuildType initialBuildType() const { return m_initialBuildType; } // FIXME: Remove.
Utils::FilePath initialBuildDirectory() const { return m_initialBuildDirectory; } // FIXME: Remove.
QString initialDisplayName() const; // FIXME: Remove.
QVariant extraInfo() const { return m_extraInfo; } // FIXME: Remove.
static QString buildTypeName(BuildType type);
@@ -108,7 +113,7 @@ signals:
void buildTypeChanged();
protected:
virtual void initialize(const BuildInfo &info);
virtual void initialize();
private:
void emitBuildDirectoryChanged();
@@ -121,6 +126,12 @@ private:
mutable Utils::Environment m_cachedEnvironment;
QString m_configWidgetDisplayName;
bool m_configWidgetHasFrame = false;
// FIXME: Remove.
BuildConfiguration::BuildType m_initialBuildType = BuildConfiguration::Unknown;
Utils::FilePath m_initialBuildDirectory;
QString m_initialDisplayName;
QVariant m_extraInfo;
};
class PROJECTEXPLORER_EXPORT BuildConfigurationFactory : public QObject