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

Android: Work around deprecation warnings

Browse Source 
Change-Id: Ie5f2ad846a134fadcb8373ee0ba24c0d4cf66c44
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-03-01 19:04:54 +01:00
parent 475e7b1283
commit d410e87829
2 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -99,9 +99,12 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
m_ui->addDebuggerCheckBox->setChecked(m_step->addDebugger());
// target sdk
connect(m_ui->targetSDKComboBox,
QOverload<const QString &>::of(&QComboBox::activated),
this, &AndroidBuildApkInnerWidget::setTargetSdk);
const auto cbActivated = QOverload<int>::of(&QComboBox::activated);
const auto cbCurrentIndexChanged = QOverload<int>::of(&QComboBox::currentIndexChanged);
connect(m_ui->targetSDKComboBox, cbActivated, this, [this](int idx) {
const QString sdk = m_ui->targetSDKComboBox->itemText(idx);
m_step->setBuildTargetSdk(sdk);
});
// deployment options
connect(m_ui->ministroOption, &QAbstractButton::clicked,
@@ -121,12 +124,15 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
this, &AndroidBuildApkInnerWidget::createKeyStore);
connect(m_ui->KeystoreLocationPathChooser, &Utils::PathChooser::pathChanged,
this, &AndroidBuildApkInnerWidget::updateKeyStorePath);
connect(m_ui->certificatesAliasComboBox,
QOverload<const QString &>::of(&QComboBox::activated),
this, &AndroidBuildApkInnerWidget::certificatesAliasComboBoxActivated);
connect(m_ui->certificatesAliasComboBox,
QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
this, &AndroidBuildApkInnerWidget::certificatesAliasComboBoxCurrentIndexChanged);
auto updateAlias = [this](int idx) {
QString alias = m_ui->certificatesAliasComboBox->itemText(idx);
if (alias.length())
m_step->setCertificateAlias(alias);
};
connect(m_ui->certificatesAliasComboBox, cbActivated, this, updateAlias);
connect(m_ui->certificatesAliasComboBox, cbCurrentIndexChanged, this, updateAlias);
connect(m_step->buildConfiguration(), &ProjectExplorer::BuildConfiguration::buildTypeChanged,
this, &AndroidBuildApkInnerWidget::updateSigningWarning);
@@ -139,11 +145,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
delete m_ui;
}
void AndroidBuildApkInnerWidget::setTargetSdk(const QString &sdk)
{
m_step->setBuildTargetSdk(sdk);
}
void AndroidBuildApkInnerWidget::signPackageCheckBoxToggled(bool checked)
{
m_ui->certificatesAliasComboBox->setEnabled(checked);
@@ -187,18 +188,6 @@ void AndroidBuildApkInnerWidget::updateKeyStorePath(const QString &path)
setCertificates();
}
void AndroidBuildApkInnerWidget::certificatesAliasComboBoxActivated(const QString &alias)
{
if (alias.length())
m_step->setCertificateAlias(alias);
}
void AndroidBuildApkInnerWidget::certificatesAliasComboBoxCurrentIndexChanged(const QString &alias)
{
if (alias.length())
m_step->setCertificateAlias(alias);
}
void AndroidBuildApkInnerWidget::openPackageLocationCheckBoxToggled(bool checked)
{
m_step->setOpenPackageLocation(checked);

3
src/plugins/android/androidbuildapkwidget.h
View File

@@ -52,10 +52,7 @@ public:
~AndroidBuildApkInnerWidget() override;
private:
void setTargetSdk(const QString &sdk);
void createKeyStore();
void certificatesAliasComboBoxCurrentIndexChanged(const QString &alias);
void certificatesAliasComboBoxActivated(const QString &alias);
void updateSigningWarning();
void openPackageLocationCheckBoxToggled(bool checked);
void verboseOutputCheckBoxToggled(bool checked);