aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/projectconfiguration.h
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-11-29 12:28:40 +0100
committerhjk <hjk@qt.io>2017-12-08 11:17:55 +0000
commit53a151074ad37d12e730fbd85ec0e0675d00f6d0 (patch)
tree041526d48608270cad2db171696fa6cf7099a852 /src/plugins/projectexplorer/projectconfiguration.h
parent9d3c5c6ff5ba059f036efae5fd9572fe454b5d84 (diff)
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes for build and deploy configurations. - Collapse the two lines of constructors similar to what 890c1906e6fb2ec did for RunConfigurations * Deploy* was purely mechanical * Build* ctors are split in connects() in the ctor body to create "empty shell for clone" etc and build step additions in initialize() functions which are only used in the create() case. -- Allows to collapse the shared 'ctor()' functions, too. - Move FooBuildConfigurationFactory::create() implementations to FooBuildConfiguration() constructor. That was a strange and unneeded ping-pong between factories and objects, and furthermore allows one level less of indirection (and for a later, left out here, some reduction of the FooBuildConfiguration interfaces that were only used to accommodate the *Factory::create() functions. - Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(), but there wasn't one in the base classses. Have one there. - Most canHandle() functions were checking simple restrictions on e.g. project or target types, specify those by setters in the constructors instead and check them in the base canHandle() - clone() is generally replaced by a creation of a "shell object" and a fromMap(source->toMap()), implemented in the base, there are two cases left for Android and Qbs that needed(?) some extra polish - generally use canHandle() in base implementation, instead of doing that in all Derived::canFoo() - as a result, canCreate/create/canClone/clone reimplementations are not needed anymore, keep the base implementation for now (could be inlined into their only users later), but de-virtualize them. - Combine Ios{Preset,DSym}BuildStepFactory. There was only one 'dsym' build step they could create. - Split the 'mangled' id into the ProjectConfiguration subtype specific constant identifier, and a QString extraId() bit. Only maintain the mangled id in saved settings. - Make ProjectConfiguration::m_id a constant member, adapt all constructors of derived classe. Not done in this patch: - Finish possible cosmetic changes on top - Add a way to specify restrictions to supported Qt versions (used in Android/Ios), as the base implementation does not depend on the qtsupport plugin - Combine the QList<X> availableFoo() + createFoo(X) function pairs to somthing like a direct QList<struct { X; std::function<X()>; }> fooCreators() to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base) pingpong - Remove the *Factories from the global object pool - Do something about priority(). Falling back to plain qmake in android+qmake setup is not helpful. Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/projectconfiguration.h')
-rw-r--r--src/plugins/projectexplorer/projectconfiguration.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index 38fe375e02..ec23948571 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -42,11 +42,14 @@ class PROJECTEXPLORER_EXPORT ProjectConfiguration : public QObject
{
Q_OBJECT
+protected:
+ explicit ProjectConfiguration(QObject *parent, Core::Id id);
+
public:
- // ctors are protected
~ProjectConfiguration() = default;
Core::Id id() const;
+
QString displayName() const;
bool usesDefaultDisplayName() const;
@@ -69,17 +72,17 @@ public:
virtual bool isActive() const = 0;
+ // Used in settings to mangle in build targets in RunConfigurations.
+ virtual QString extraId() const;
+
+ static QString settingsIdKey();
+
signals:
void displayNameChanged();
void toolTipChanged();
-protected:
- ProjectConfiguration(QObject *parent);
- void initialize(Core::Id id);
- void copyFrom(const ProjectConfiguration *source);
-
private:
- Core::Id m_id;
+ const Core::Id m_id;
QString m_displayName;
QString m_defaultDisplayName;
QString m_toolTip;
@@ -101,8 +104,7 @@ signals:
void enabledChanged();
protected:
- StatefulProjectConfiguration(QObject *parent);
- void copyFrom(const StatefulProjectConfiguration *source);
+ StatefulProjectConfiguration(QObject *parent, Core::Id id);
void setEnabled(bool enabled);