summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidsettingswidget.h
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@theqtcompany.com>2015-01-08 17:05:09 +0100
committerDaniel Teske <daniel.teske@theqtcompany.com>2015-01-13 11:11:52 +0100
commitab372deb1fb7365eb9fb5d01b13bd3d2ea56706e (patch)
tree01d96ddf6c382b75f9058f8b68e2535836f477ef /src/plugins/android/androidsettingswidget.h
parent8a29109fe9cc4838185d17d94f5ee178c4b2abc1 (diff)
downloadqt-creator-ab372deb1fb7365eb9fb5d01b13bd3d2ea56706e.tar.gz
Android: Reduce time to open settings widget
Two major areas of improvement: - Make connections last, so that the initial setup does not trigger any unnecessary checks. - Make fetching the list of android virtual devices a background operation. Together they reduce the time needed to open the settings for me by roughly 10 times. Task-number: QTCREATORBUG-13735 Change-Id: I0839853dcdbdfe20a183a27888e55d3c56a9b815 Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.h')
-rw-r--r--src/plugins/android/androidsettingswidget.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/android/androidsettingswidget.h b/src/plugins/android/androidsettingswidget.h
index f73b35bfcf..20a73eae61 100644
--- a/src/plugins/android/androidsettingswidget.h
+++ b/src/plugins/android/androidsettingswidget.h
@@ -96,6 +96,7 @@ private slots:
void checkGdbFinished();
void showGdbWarningDialog();
+ void updateAvds();
private:
enum Mode { Sdk = 1, Ndk = 2, Java = 4, All = Sdk | Ndk | Java };
@@ -104,6 +105,9 @@ private:
void applyToUi(Mode mode);
bool sdkLocationIsValid() const;
bool sdkPlatformToolsInstalled() const;
+ void startUpdateAvd();
+ void enableAvdControls();
+ void disableAvdControls();
State m_sdkState;
State m_ndkState;
@@ -118,6 +122,9 @@ private:
QFutureWatcher<AndroidConfig::CreateAvdInfo> m_futureWatcher;
QFutureWatcher<QPair<QStringList, bool>> m_checkGdbWatcher;
QStringList m_gdbCheckPaths;
+
+ QFutureWatcher<QVector<AndroidDeviceInfo>> m_virtualDevicesWatcher;
+ QString m_lastAddedAvd;
};
} // namespace Internal