diff options
| author | Alessandro Portale <alessandro.portale@digia.com> | 2014-03-04 23:38:21 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@digia.com> | 2014-03-05 12:18:31 +0100 |
| commit | c1b2ed036fc9ca2b14bc9d39c2d79d7ed858a12a (patch) | |
| tree | e27163ecd8d4ebd36562c8050848badcd0e2884f /src/plugins/android/androidsettingswidget.h | |
| parent | c3754368479fb3b4c66df3a405e0cfea5efa8377 (diff) | |
| download | qt-creator-c1b2ed036fc9ca2b14bc9d39c2d79d7ed858a12a.tar.gz | |
Android: More accurate Android Sdk location error messages
If the user installs a fresh Android SDK and selects its path in
the Android options, Qt Creator will still say that this is not
a valid Android SDK.
The reason is that Qt Creator also checks for the platform tools
to be installed. Installing those is a separate step which needs
to be done after installing the SDK.
This patch enables Qt Creator to tell the user if the platform
tools are missing, but the SDK is otherwise fine.
Change-Id: I3557fb93d46e8677498843250302d12c8babb1df
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.h')
| -rw-r--r-- | src/plugins/android/androidsettingswidget.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/android/androidsettingswidget.h b/src/plugins/android/androidsettingswidget.h index eebd20d163..5e6fb1238d 100644 --- a/src/plugins/android/androidsettingswidget.h +++ b/src/plugins/android/androidsettingswidget.h @@ -98,6 +98,8 @@ private: enum State { NotSet = 0, Okay = 1, Error = 2 }; void check(Mode mode); void applyToUi(Mode mode); + bool sdkLocationIsValid() const; + bool sdkPlatformToolsInstalled() const; State m_sdkState; State m_ndkState; |