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

Android: Re-design android settings

Browse Source 
Make Android setup related issues visible to user

Change-Id: Ib543c41edd9031d2bf12ac2e87b84bf4791781b7
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Vikas Pachdha
2017-09-14 13:29:46 +02:00
parent eaa5cfaa98
commit 240d310a81
3 changed files with 397 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/android/androidsettingswidget.h
View File

@@ -73,9 +73,9 @@ public:
void saveSettings();
private:
void sdkLocationEditingFinished();
void ndkLocationEditingFinished();
void openJDKLocationEditingFinished();
void validateJdk();
void validateNdk();
void validateSdk();
void openSDKDownloadUrl();
void openNDKDownloadUrl();
void openOpenJDKDownloadUrl();
@@ -88,26 +88,15 @@ private:
void manageAVD();
void createKitToggled();
void checkMissingQtVersion();
void updateUI();
void updateAvds();
private:
enum Mode { Sdk = 1, Ndk = 2, Java = 4, All = Sdk | Ndk | Java };
enum State { NotSet = 0, Okay = 1, Error = 2 };
bool verifySdkInstallation(QString *errorDetails = nullptr) const;
void check(Mode mode);
void applyToUi(Mode mode);
void startUpdateAvd();
void enableAvdControls();
void disableAvdControls();
State m_sdkState;
QString m_sdkInstallationError;
State m_ndkState;
QString m_ndkErrorMessage;
int m_ndkCompilerCount;
QString m_ndkMissingQtArchs;
State m_javaState;
Ui_AndroidSettingsWidget *m_ui;
AndroidConfig m_androidConfig;
AvdModel m_AVDModel;