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

Android: Rename setConfig() into applyConfig()

Browse Source 
Get rid of the AndroidConfig arg.

Change-Id: Ifa828d4d9f382eb904d775bab890a801086b8a3b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-21 13:41:14 +02:00
parent 5dd3cff8ef
commit 665387bc6d
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidconfigurations.cpp
View File

@@ -1144,11 +1144,9 @@ AndroidConfigurations::AndroidConfigurations()
m_instance = this; m_instance = this;
} }
void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs) void AndroidConfigurations::applyConfig()
{ {
emit m_instance->aboutToUpdate(); emit m_instance->aboutToUpdate();
androidConfig() = devConfigs;
m_instance->save(); m_instance->save();
updateAndroidDevice(); updateAndroidDevice();
registerNewToolchains(); registerNewToolchains();

2
src/plugins/android/androidconfigurations.h
View File

@@ -169,7 +169,7 @@ class AndroidConfigurations : public QObject
public: public:
static Internal::AndroidSdkManager *sdkManager(); static Internal::AndroidSdkManager *sdkManager();
static void setConfig(const AndroidConfig &config); static void applyConfig();
static AndroidConfigurations *instance(); static AndroidConfigurations *instance();
static void registerNewToolchains(); static void registerNewToolchains();

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -518,7 +518,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
}, Qt::SingleShotConnection); }, Qt::SingleShotConnection);
}); });
setOnApply([] { AndroidConfigurations::setConfig(androidConfig()); }); setOnApply([] { AndroidConfigurations::applyConfig(); });
} }
void AndroidSettingsWidget::showEvent(QShowEvent *event) void AndroidSettingsWidget::showEvent(QShowEvent *event)