diff --git a/src/plugins/android/androidsdkmanagerdialog.cpp b/src/plugins/android/androidsdkmanagerdialog.cpp index 8a6d941fd13..c8c070d6486 100644 --- a/src/plugins/android/androidsdkmanagerdialog.cpp +++ b/src/plugins/android/androidsdkmanagerdialog.cpp @@ -139,9 +139,9 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, auto expandCheck = new QCheckBox(Tr::tr("Expand All")); - m_buttonBox = new QDialogButtonBox; - m_buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel); - m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); + auto buttonBox = new QDialogButtonBox; + buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel); + buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); auto proxyModel = new PackageFilterModel(m_sdkModel); packagesView->setModel(proxyModel); @@ -172,11 +172,11 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, optionsButton, }, br, }, - m_buttonBox, + buttonBox, }.attachTo(this); - connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this] { - m_buttonBox->button(QDialogButtonBox::Apply) + connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this, buttonBox] { + buttonBox->button(QDialogButtonBox::Apply) ->setEnabled(m_sdkModel->installationChange().count()); }); @@ -215,10 +215,10 @@ AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, expandCheck->setChecked(!text.isEmpty()); }); - connect(m_buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] { + connect(buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] { m_sdkManager->runInstallationChange(m_sdkModel->installationChange()); }); - connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject); + connect(buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject); connect(optionsButton, &QPushButton::clicked, this, [this] { OptionsDialog dlg(m_sdkManager, this); diff --git a/src/plugins/android/androidsdkmanagerdialog.h b/src/plugins/android/androidsdkmanagerdialog.h index 35a9de172a5..ed57211c52c 100644 --- a/src/plugins/android/androidsdkmanagerdialog.h +++ b/src/plugins/android/androidsdkmanagerdialog.h @@ -6,10 +6,6 @@ #include -QT_BEGIN_NAMESPACE -class QDialogButtonBox; -QT_END_NAMESPACE - namespace Android::Internal { class AndroidSdkManager; @@ -23,7 +19,6 @@ public: private: AndroidSdkManager *m_sdkManager = nullptr; AndroidSdkModel *m_sdkModel = nullptr; - QDialogButtonBox *m_buttonBox = nullptr; }; } // Android::Internal