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

iOS: Rename signing settings widget and make independent from qmake

Browse Source 
The build settings widget for the signing settings should not depend on
qmake specifics. Move these to the build configuration.

Change-Id: Ie5feba577304fae9bde3ed01530250d02be982e1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-02-03 15:42:44 +01:00
parent 5b7a3fba27
commit eb7110ddd8
2 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -61,11 +61,12 @@ const char autoManagedSigningKey[] = "Ios.AutoManagedSigning";
const int IdentifierRole = Qt::UserRole+1; const int IdentifierRole = Qt::UserRole+1;
class IosSigningSettingsWidget : public NamedWidget
class IosBuildSettingsWidget : public NamedWidget
{ {
public: public:
explicit IosBuildSettingsWidget(IosBuildConfiguration *iosBuildConfiguration); explicit IosSigningSettingsWidget(BuildConfiguration *buildConfiguration,
BoolAspect *autoManagedSigning,
StringAspect *signingIdentifier);
bool isSigningAutomaticallyManaged() const; bool isSigningAutomaticallyManaged() const;
@@ -83,7 +84,8 @@ private:
void updateWarningText(); void updateWarningText();
private: private:
IosBuildConfiguration *m_bc = nullptr; BoolAspect *m_autoManagedSigning = nullptr;
StringAspect *m_signingIdentifier = nullptr;
QString m_lastProfileSelection; QString m_lastProfileSelection;
QString m_lastTeamSelection; QString m_lastTeamSelection;
const bool m_isDevice; const bool m_isDevice;
@@ -96,10 +98,13 @@ private:
Utils::InfoLabel *m_warningLabel; Utils::InfoLabel *m_warningLabel;
}; };
IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc) IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConfiguration,
: NamedWidget(IosBuildConfiguration::tr("iOS Settings")), BoolAspect *autoManagedSigning,
m_bc(bc), StringAspect *signingIdentifier)
m_isDevice(DeviceTypeKitAspect::deviceTypeId(bc->kit()) : NamedWidget(IosBuildConfiguration::tr("iOS Settings"))
, m_autoManagedSigning(autoManagedSigning)
, m_signingIdentifier(signingIdentifier)
, m_isDevice(DeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
== Constants::IOS_DEVICE_TYPE) == Constants::IOS_DEVICE_TYPE)
{ {
auto detailsWidget = new Utils::DetailsWidget(this); auto detailsWidget = new Utils::DetailsWidget(this);
@@ -126,7 +131,7 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
m_autoSignCheckbox->setSizePolicy(sizePolicy2); m_autoSignCheckbox->setSizePolicy(sizePolicy2);
m_autoSignCheckbox->setChecked(true); m_autoSignCheckbox->setChecked(true);
m_autoSignCheckbox->setText(IosBuildConfiguration::tr("Automatically manage signing")); m_autoSignCheckbox->setText(IosBuildConfiguration::tr("Automatically manage signing"));
m_autoSignCheckbox->setChecked(bc->m_autoManagedSigning->value()); m_autoSignCheckbox->setChecked(m_autoManagedSigning->value());
m_autoSignCheckbox->setEnabled(m_isDevice); m_autoSignCheckbox->setEnabled(m_isDevice);
m_signEntityLabel = new QLabel(container); m_signEntityLabel = new QLabel(container);
@@ -137,7 +142,7 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
m_signEntityLabel->setText(IosBuildConfiguration::tr("Development team:")); m_signEntityLabel->setText(IosBuildConfiguration::tr("Development team:"));
connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosBuildSettingsWidget::onReset); connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosSigningSettingsWidget::onReset);
m_infoLabel->hide(); m_infoLabel->hide();
@@ -147,13 +152,19 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
detailsWidget->setWidget(container); detailsWidget->setWidget(container);
if (m_isDevice) { if (m_isDevice) {
connect(IosConfigurations::instance(), &IosConfigurations::provisioningDataChanged, connect(IosConfigurations::instance(),
this, &IosBuildSettingsWidget::populateDevelopmentTeams); &IosConfigurations::provisioningDataChanged,
connect(m_signEntityCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
this, &IosBuildSettingsWidget::onSigningEntityComboIndexChanged); &IosSigningSettingsWidget::populateDevelopmentTeams);
connect(m_autoSignCheckbox, &QCheckBox::toggled, connect(m_signEntityCombo,
this, &IosBuildSettingsWidget::configureSigningUi); QOverload<int>::of(&QComboBox::currentIndexChanged),
const QString signingIdentifier = bc->m_signingIdentifier->value(); this,
&IosSigningSettingsWidget::onSigningEntityComboIndexChanged);
connect(m_autoSignCheckbox,
&QCheckBox::toggled,
this,
&IosSigningSettingsWidget::configureSigningUi);
const QString signingIdentifier = m_signingIdentifier->value();
configureSigningUi(m_autoSignCheckbox->isChecked()); configureSigningUi(m_autoSignCheckbox->isChecked());
setDefaultSigningIdentfier(signingIdentifier); setDefaultSigningIdentfier(signingIdentifier);
} }
@@ -178,7 +189,7 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
verticalLayout->addWidget(m_warningLabel); verticalLayout->addWidget(m_warningLabel);
} }
void IosBuildSettingsWidget::setDefaultSigningIdentfier(const QString &identifier) const void IosSigningSettingsWidget::setDefaultSigningIdentfier(const QString &identifier) const
{ {
if (identifier.isEmpty()) { if (identifier.isEmpty()) {
m_signEntityCombo->setCurrentIndex(0); m_signEntityCombo->setCurrentIndex(0);
@@ -204,12 +215,12 @@ void IosBuildSettingsWidget::setDefaultSigningIdentfier(const QString &identifie
} }
} }
bool IosBuildSettingsWidget::isSigningAutomaticallyManaged() const bool IosSigningSettingsWidget::isSigningAutomaticallyManaged() const
{ {
return m_autoSignCheckbox->isChecked() && m_signEntityCombo->currentIndex() > 0; return m_autoSignCheckbox->isChecked() && m_signEntityCombo->currentIndex() > 0;
} }
void IosBuildSettingsWidget::onSigningEntityComboIndexChanged() void IosSigningSettingsWidget::onSigningEntityComboIndexChanged()
{ {
QString identifier = selectedIdentifier(); QString identifier = selectedIdentifier();
(m_autoSignCheckbox->isChecked() ? m_lastTeamSelection : m_lastProfileSelection) = identifier; (m_autoSignCheckbox->isChecked() ? m_lastTeamSelection : m_lastProfileSelection) = identifier;
@@ -219,7 +230,7 @@ void IosBuildSettingsWidget::onSigningEntityComboIndexChanged()
announceSigningChanged(m_autoSignCheckbox->isChecked(), identifier); announceSigningChanged(m_autoSignCheckbox->isChecked(), identifier);
} }
void IosBuildSettingsWidget::onReset() void IosSigningSettingsWidget::onReset()
{ {
m_lastTeamSelection.clear(); m_lastTeamSelection.clear();
m_lastProfileSelection.clear(); m_lastProfileSelection.clear();
@@ -227,7 +238,7 @@ void IosBuildSettingsWidget::onReset()
setDefaultSigningIdentfier(""); setDefaultSigningIdentfier("");
} }
void IosBuildSettingsWidget::configureSigningUi(bool autoManageSigning) void IosSigningSettingsWidget::configureSigningUi(bool autoManageSigning)
{ {
m_signEntityLabel->setText(autoManageSigning ? IosBuildConfiguration::tr("Development team:") m_signEntityLabel->setText(autoManageSigning ? IosBuildConfiguration::tr("Development team:")
: IosBuildConfiguration::tr("Provisioning profile:")); : IosBuildConfiguration::tr("Provisioning profile:"));
@@ -240,17 +251,16 @@ void IosBuildSettingsWidget::configureSigningUi(bool autoManageSigning)
announceSigningChanged(autoManageSigning, selectedIdentifier()); announceSigningChanged(autoManageSigning, selectedIdentifier());
} }
void IosBuildSettingsWidget::announceSigningChanged(bool autoManagedSigning, QString identifier) void IosSigningSettingsWidget::announceSigningChanged(bool autoManagedSigning, QString identifier)
{ {
if (m_bc->m_signingIdentifier->value().compare(identifier) != 0 if (m_signingIdentifier->value().compare(identifier) != 0
|| m_bc->m_autoManagedSigning->value() != autoManagedSigning) { || m_autoManagedSigning->value() != autoManagedSigning) {
m_bc->m_autoManagedSigning->setValue(autoManagedSigning); m_autoManagedSigning->setValue(autoManagedSigning);
m_bc->m_signingIdentifier->setValue(identifier); m_signingIdentifier->setValue(identifier);
m_bc->updateQmakeCommand();
} }
} }
void IosBuildSettingsWidget::populateDevelopmentTeams() void IosSigningSettingsWidget::populateDevelopmentTeams()
{ {
{ {
QSignalBlocker blocker(m_signEntityCombo); QSignalBlocker blocker(m_signEntityCombo);
@@ -269,7 +279,7 @@ void IosBuildSettingsWidget::populateDevelopmentTeams()
updateWarningText(); updateWarningText();
} }
void IosBuildSettingsWidget::populateProvisioningProfiles() void IosSigningSettingsWidget::populateProvisioningProfiles()
{ {
{ {
// Populate Team id's // Populate Team id's
@@ -292,12 +302,12 @@ void IosBuildSettingsWidget::populateProvisioningProfiles()
updateWarningText(); updateWarningText();
} }
QString IosBuildSettingsWidget::selectedIdentifier() const QString IosSigningSettingsWidget::selectedIdentifier() const
{ {
return m_signEntityCombo->currentData(IdentifierRole).toString(); return m_signEntityCombo->currentData(IdentifierRole).toString();
} }
void IosBuildSettingsWidget::updateInfoText() void IosSigningSettingsWidget::updateInfoText()
{ {
if (!m_isDevice) if (!m_isDevice)
return; return;
@@ -342,7 +352,7 @@ void IosBuildSettingsWidget::updateInfoText()
m_infoLabel->setText(infoMessage); m_infoLabel->setText(infoMessage);
} }
void IosBuildSettingsWidget::updateWarningText() void IosSigningSettingsWidget::updateWarningText()
{ {
if (!m_isDevice) if (!m_isDevice)
return; return;
@@ -387,6 +397,15 @@ IosBuildConfiguration::IosBuildConfiguration(Target *target, Utils::Id id)
m_autoManagedSigning = addAspect<BoolAspect>(); m_autoManagedSigning = addAspect<BoolAspect>();
m_autoManagedSigning->setDefaultValue(true); m_autoManagedSigning->setDefaultValue(true);
m_autoManagedSigning->setSettingsKey(autoManagedSigningKey); m_autoManagedSigning->setSettingsKey(autoManagedSigningKey);
connect(m_signingIdentifier,
&BaseAspect::changed,
this,
&IosBuildConfiguration::updateQmakeCommand);
connect(m_autoManagedSigning,
&BaseAspect::changed,
this,
&IosBuildConfiguration::updateQmakeCommand);
} }
QList<NamedWidget *> IosBuildConfiguration::createSubConfigWidgets() QList<NamedWidget *> IosBuildConfiguration::createSubConfigWidgets()
@@ -394,7 +413,9 @@ QList<NamedWidget *> IosBuildConfiguration::createSubConfigWidgets()
auto subConfigWidgets = QmakeBuildConfiguration::createSubConfigWidgets(); auto subConfigWidgets = QmakeBuildConfiguration::createSubConfigWidgets();
// Ownership of this widget is with BuildSettingsWidget // Ownership of this widget is with BuildSettingsWidget
auto buildSettingsWidget = new IosBuildSettingsWidget(this); auto buildSettingsWidget = new IosSigningSettingsWidget(this,
m_autoManagedSigning,
m_signingIdentifier);
subConfigWidgets.prepend(buildSettingsWidget); subConfigWidgets.prepend(buildSettingsWidget);
return subConfigWidgets; return subConfigWidgets;
} }

2
src/plugins/ios/iosbuildconfiguration.h
View File

@@ -39,8 +39,6 @@ public:
IosBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id); IosBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
private: private:
friend class IosBuildSettingsWidget;
QList<ProjectExplorer::NamedWidget *> createSubConfigWidgets() override; QList<ProjectExplorer::NamedWidget *> createSubConfigWidgets() override;
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;