forked from qt-creator/qt-creator
Target: Make constructor private
Use Project::createTarget consistently Change-Id: Ic8b60f35a830080d325758c93bca7068c9859c59 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
@@ -59,7 +59,6 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Target(Project *parent, Kit *k);
|
|
||||||
~Target() override;
|
~Target() override;
|
||||||
|
|
||||||
Project *project() const;
|
Project *project() const;
|
||||||
@@ -158,6 +157,7 @@ signals:
|
|||||||
void buildDirectoryChanged();
|
void buildDirectoryChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Target(Project *parent, Kit *k);
|
||||||
void setEnabled(bool);
|
void setEnabled(bool);
|
||||||
|
|
||||||
bool fromMap(const QVariantMap &map) override;
|
bool fromMap(const QVariantMap &map) override;
|
||||||
@@ -169,7 +169,6 @@ private:
|
|||||||
void changeBuildConfigurationEnabled();
|
void changeBuildConfigurationEnabled();
|
||||||
void changeDeployConfigurationEnabled();
|
void changeDeployConfigurationEnabled();
|
||||||
void changeRunConfigurationEnabled();
|
void changeRunConfigurationEnabled();
|
||||||
|
|
||||||
void handleKitUpdates(ProjectExplorer::Kit *k);
|
void handleKitUpdates(ProjectExplorer::Kit *k);
|
||||||
void handleKitRemoval(ProjectExplorer::Kit *k);
|
void handleKitRemoval(ProjectExplorer::Kit *k);
|
||||||
|
|
||||||
|
@@ -863,7 +863,7 @@ Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *e
|
|||||||
if (res == RestoreResult::Ok) {
|
if (res == RestoreResult::Ok) {
|
||||||
Kit *defaultKit = KitManager::defaultKit();
|
Kit *defaultKit = KitManager::defaultKit();
|
||||||
if (!activeTarget() && defaultKit)
|
if (!activeTarget() && defaultKit)
|
||||||
addTarget(new Target(this, defaultKit));
|
addTarget(createTarget(defaultKit));
|
||||||
|
|
||||||
refresh();
|
refresh();
|
||||||
|
|
||||||
|
@@ -606,13 +606,8 @@ Project::RestoreResult QbsProject::fromMap(const QVariantMap &map, QString *erro
|
|||||||
return result;
|
return result;
|
||||||
|
|
||||||
Kit *defaultKit = KitManager::defaultKit();
|
Kit *defaultKit = KitManager::defaultKit();
|
||||||
if (!activeTarget() && defaultKit) {
|
if (!activeTarget() && defaultKit)
|
||||||
Target *t = new Target(this, defaultKit);
|
addTarget(createTarget(defaultKit));
|
||||||
t->updateDefaultBuildConfigurations();
|
|
||||||
t->updateDefaultDeployConfigurations();
|
|
||||||
t->updateDefaultRunConfigurations();
|
|
||||||
addTarget(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
return RestoreResult::Ok;
|
return RestoreResult::Ok;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user