forked from qt-creator/qt-creator
Android: Rename setConfig() into applyConfig()
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:
@@ -1144,11 +1144,9 @@ AndroidConfigurations::AndroidConfigurations()
|
||||
m_instance = this;
|
||||
}
|
||||
|
||||
void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
|
||||
void AndroidConfigurations::applyConfig()
|
||||
{
|
||||
emit m_instance->aboutToUpdate();
|
||||
androidConfig() = devConfigs;
|
||||
|
||||
m_instance->save();
|
||||
updateAndroidDevice();
|
||||
registerNewToolchains();
|
||||
|
||||
@@ -169,7 +169,7 @@ class AndroidConfigurations : public QObject
|
||||
|
||||
public:
|
||||
static Internal::AndroidSdkManager *sdkManager();
|
||||
static void setConfig(const AndroidConfig &config);
|
||||
static void applyConfig();
|
||||
static AndroidConfigurations *instance();
|
||||
|
||||
static void registerNewToolchains();
|
||||
|
||||
@@ -518,7 +518,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
|
||||
}, Qt::SingleShotConnection);
|
||||
});
|
||||
|
||||
setOnApply([] { AndroidConfigurations::setConfig(androidConfig()); });
|
||||
setOnApply([] { AndroidConfigurations::applyConfig(); });
|
||||
}
|
||||
|
||||
void AndroidSettingsWidget::showEvent(QShowEvent *event)
|
||||
|
||||
Reference in New Issue
Block a user