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

Drop Qt5: Android, IOS & WASM: Get rid of QOverload

Browse Source 
Add a context object into some lambdas.

Change-Id: I72631aeb36703f8f335f3819796fb52148f1b377
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-19 22:51:32 +02:00
parent 0dae822ca3
commit a98b185e90
18 changed files with 66 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -189,8 +189,7 @@ QWidget *AndroidBuildApkWidget::createApplicationGroup()
targetSDKComboBox->addItems(targets);
targetSDKComboBox->setCurrentIndex(targets.indexOf(m_step->buildTargetSdk()));
const auto cbActivated = QOverload<int>::of(&QComboBox::activated);
connect(targetSDKComboBox, cbActivated, this, [this, targetSDKComboBox](int idx) {
connect(targetSDKComboBox, &QComboBox::activated, this, [this, targetSDKComboBox](int idx) {
const QString sdk = targetSDKComboBox->itemText(idx);
m_step->setBuildTargetSdk(sdk);
AndroidManager::updateGradleProperties(m_step->target(), QString()); // FIXME: Use real key.
@@ -292,11 +291,8 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup()
m_step->setCertificateAlias(alias);
};
const auto cbActivated = QOverload<int>::of(&QComboBox::activated);
const auto cbCurrentIndexChanged = QOverload<int>::of(&QComboBox::currentIndexChanged);
connect(m_certificatesAliasComboBox, cbActivated, this, updateAlias);
connect(m_certificatesAliasComboBox, cbCurrentIndexChanged, this, updateAlias);
connect(m_certificatesAliasComboBox, &QComboBox::activated, this, updateAlias);
connect(m_certificatesAliasComboBox, &QComboBox::currentIndexChanged, this, updateAlias);
return group;
}
@@ -1094,7 +1090,7 @@ PasswordInputDialog::PasswordInputDialog(PasswordInputDialog::Context context,
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
});
connect(buttonBox, &QDialogButtonBox::accepted, [this]() {
connect(buttonBox, &QDialogButtonBox::accepted, [this] {
if (verifyCallback(inputEdit->text())) {
accept(); // Dialog accepted.
} else {