diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2018-04-18 12:23:02 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2018-04-19 10:05:03 +0000 |
| commit | 6e4ae817c2b5b8d732124bddbd34977f332c5d53 (patch) | |
| tree | b84eba6108a13a3e998b45d609593866f6d1f46d /src/plugins/android/androidavdmanager.cpp | |
| parent | 26e4db6514b5abcc8a20a5d39ce8e3718f47a5b0 (diff) | |
Android: Check for missing emulator tool
Task-number: QTCREATORBUG-20160
Change-Id: I481adfe9a7a1b2c9c151d01d2fe1b010735c898b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/android/androidavdmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidavdmanager.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 954053b08bc..a376a3194c3 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -26,6 +26,7 @@ #include "androidtoolmanager.h" +#include "coreplugin/icore.h" #include "utils/algorithm.h" #include "utils/qtcassert.h" #include "utils/runextensions.h" @@ -34,6 +35,7 @@ #include <QApplication> #include <QFileInfo> #include <QLoggingCategory> +#include <QMessageBox> #include <QSettings> #include <chrono> @@ -270,6 +272,15 @@ QString AndroidAvdManager::startAvd(const QString &name) const bool AndroidAvdManager::startAvdAsync(const QString &avdName) const { + QFileInfo info(m_config.emulatorToolPath().toString()); + if (!info.exists()) { + QMessageBox::critical(Core::ICore::dialogParent(), + tr("Emulator Tool Is Missing"), + tr("Install the missing emulator tool (%1) to the" + " installed Android SDK.") + .arg(m_config.emulatorToolPath().toString())); + return false; + } QProcess *avdProcess = new QProcess(); QObject::connect(avdProcess, static_cast<void (QProcess::*)(int)>(&QProcess::finished), avdProcess, &QObject::deleteLater); |