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

Android: Use new setup for more plugin items

Browse Source 
Change-Id: Id5ff09813ab7b4be425d007abd4cc04d9c9472c1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-11-22 17:46:57 +01:00
parent 497b9b3c2c
commit 353c3cc930
17 changed files with 240 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1104,6 +1104,19 @@ FilePath AndroidConfig::defaultSdkPath()
///////////////////////////////////
// AndroidConfigurations
///////////////////////////////////
AndroidConfigurations *m_instance = nullptr;
AndroidConfigurations::AndroidConfigurations()
: m_sdkManager(new AndroidSdkManager(m_config))
{
load();
connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
this, &AndroidConfigurations::updateAndroidDevice);
m_instance = this;
}
void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
{
emit m_instance->aboutToUpdate();
@@ -1452,18 +1465,6 @@ void AndroidConfigurations::save()
settings->endGroup();
}
AndroidConfigurations::AndroidConfigurations()
: m_sdkManager(new AndroidSdkManager(m_config))
{
load();
connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
this, &AndroidConfigurations::updateAndroidDevice);
m_instance = this;
}
AndroidConfigurations::~AndroidConfigurations() = default;
static FilePath androidStudioPath()
{
#if defined(Q_OS_WIN)
@@ -1562,8 +1563,6 @@ void AndroidConfigurations::updateAndroidDevice()
AndroidDeviceManager::instance()->setupDevicesWatcher();
}
AndroidConfigurations *AndroidConfigurations::m_instance = nullptr;
#ifdef WITH_TESTS
void AndroidPlugin::testAndroidConfigAvailableNdkPlatforms_data()
{
@@ -1620,6 +1619,12 @@ void AndroidPlugin::testAndroidConfigAvailableNdkPlatforms()
const QList<int> foundPlatforms = availableNdkPlatformsImpl(ndkPath, abis, hostOs);
QCOMPARE(foundPlatforms, expectedPlatforms);
}
#endif // WITH_TESTS
void setupAndroidConfigurations()
{
static AndroidConfigurations theAndroidConfigurations;
}
} // namespace Android