diff options
| author | Daniel Teske <[email protected]> | 2013-12-16 20:19:07 +0100 |
|---|---|---|
| committer | Daniel Teske <[email protected]> | 2014-01-17 13:01:22 +0100 |
| commit | 257c04b664b6baf1d3dd6c168ac7dec0b00fe9b4 (patch) | |
| tree | f3404c68b76174dab4c8e6296472672848b7eeaa /src/plugins/android/androidplugin.cpp | |
| parent | 4dcb679e10402d1e24c6b6f3b0b6bfda49dc3c7a (diff) | |
Android: Rework settings dialog
Make it possible to create multiple AndroidConfigs so that we can have
a different one in the settings dialog from the global one. Move pretty
much every method from AndroidConfigurations to AndroidConfig, so that
the settings dialog can work with its copy. Also add some additional
logic to the settings page around the java setting. To start the avd
manager we need both a sdk path and a java path. Also do some basic
additional checking of the java path.
Task-number: QTCREATORBUG-7724
Task-number: QTCREATORBUG-10936
Task-number: QTCREATORBUG-10937
Task-number: QTCREATORBUG-11059
Task-number: QTCREATORBUG-11218
Change-Id: I148c69b9c98a8a070d17d9b0e223d01db1750e69
Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
| -rw-r--r-- | src/plugins/android/androidplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 74556bac3d3..e772c7fc7ce 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -69,7 +69,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa Q_UNUSED(arguments); Q_UNUSED(errorMessage); - Internal::AndroidConfigurations::instance(this); + new Internal::AndroidConfigurations(this); addAutoReleasedObject(new Internal::AndroidRunControlFactory); addAutoReleasedObject(new Internal::AndroidRunConfigurationFactory); @@ -109,16 +109,16 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa void AndroidPlugin::kitsRestored() { - Internal::AndroidConfigurations::instance().updateAutomaticKitList(); + Internal::AndroidConfigurations::updateAutomaticKitList(); connect(QtSupport::QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)), - &Internal::AndroidConfigurations::instance(), SLOT(updateAutomaticKitList())); + Internal::AndroidConfigurations::instance(), SLOT(updateAutomaticKitList())); disconnect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(kitsRestored())); } void AndroidPlugin::updateDevice() { - Internal::AndroidConfigurations::instance().updateAndroidDevice(); + Internal::AndroidConfigurations::updateAndroidDevice(); } } // namespace Android |