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

Android: Check for AVD startup failure

Browse Source 
Task-number: QTCREATORBUG-20160
Change-Id: Ifbae6d10da6c782e701bc7840ce4324526d0dd82
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Vikas Pachdha
2018-04-19 09:18:42 +02:00
parent 366c7b2c32
commit 83d8de3366
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/android/androidavdmanager.cpp
View File

@@ -39,6 +39,7 @@
#include <QSettings> #include <QSettings>
#include <chrono> #include <chrono>
#include <functional>
namespace { namespace {
Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager") Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager")
@@ -195,6 +196,18 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig config, const CreateAv
return result; return result;
} }
static void avdProcessFinished(int exitCode, QProcess *p)
{
QTC_ASSERT(p, return);
if (exitCode) {
QString title = QCoreApplication::translate("Android::Internal::AndroidAvdManager",
"AVD Start Error");
QMessageBox::critical(Core::ICore::dialogParent(), title,
QString::fromLatin1(p->readAll()));
}
p->deleteLater();
}
/*! /*!
\class AvdManagerOutputParser \class AvdManagerOutputParser
\brief The AvdManagerOutputParser class is a helper class to parse the output of the avdmanager \brief The AvdManagerOutputParser class is a helper class to parse the output of the avdmanager
@@ -282,8 +295,10 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
return false; return false;
} }
QProcess *avdProcess = new QProcess(); QProcess *avdProcess = new QProcess();
QObject::connect(avdProcess, static_cast<void (QProcess::*)(int)>(&QProcess::finished), QObject::connect(avdProcess,
avdProcess, &QObject::deleteLater); static_cast<void (QProcess::*)(int)>(&QProcess::finished),
avdProcess,
std::bind(&avdProcessFinished, std::placeholders::_1, avdProcess));
// start the emulator // start the emulator
QStringList arguments; QStringList arguments;