Merge remote-tracking branch 'origin/4.14'

Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
Eike Ziller
2020-11-19 15:38:13 +01:00
271 changed files with 2816 additions and 1016 deletions

View File

@@ -153,8 +153,9 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
this, &IosBuildSettingsWidget::onSigningEntityComboIndexChanged);
connect(m_autoSignCheckbox, &QCheckBox::toggled,
this, &IosBuildSettingsWidget::configureSigningUi);
const QString signingIdentifier = bc->m_signingIdentifier->value();
configureSigningUi(m_autoSignCheckbox->isChecked());
setDefaultSigningIdentfier(bc->m_signingIdentifier->value());
setDefaultSigningIdentfier(signingIdentifier);
}
m_signEntityCombo->setEnabled(m_isDevice);

View File

@@ -369,11 +369,6 @@ void IosRunSupport::start()
IosRunner::start();
}
void IosRunSupport::stop()
{
IosRunner::stop();
}
//
// IosQmlProfilerSupport
//

View File

@@ -60,7 +60,7 @@ public:
QmlDebug::QmlDebugServicesPreset qmlDebugServices() const;
void start() override;
void stop() override;
void stop() override final;
virtual void appOutput(const QString &/*output*/) {}
virtual void errorMsg(const QString &/*msg*/) {}
@@ -106,7 +106,6 @@ public:
void didStartApp(IosToolHandler::OpStatus status);
private:
void start() override;
void stop() override;
};