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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
This commit is contained in:
Eike Ziller
2022-07-20 11:53:36 +02:00
parent 034acdeeb2 e1b0ba2473
commit 3ec87e37ee
77 changed files with 917 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,11 +267,15 @@ 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()));
const QString emulatorToolPath = m_config.emulatorToolPath().toUserOutput();
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulatorToolPath] {
QMessageBox::critical(Core::ICore::dialogParent(),
AndroidAvdManager::tr("Emulator Tool Is Missing"),
AndroidAvdManager::tr(
"Install the missing emulator tool (%1) to the"
" installed Android SDK.")
.arg(emulatorToolPath));
});
return false;
}
@@ -283,10 +287,13 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
avdProcess->setProcessChannelMode(QProcess::MergedChannels);
QObject::connect(avdProcess, &QtcProcess::done, avdProcess, [avdProcess] {
if (avdProcess->exitCode()) {
const QString title = QCoreApplication::translate("Android::Internal::AndroidAvdManager",
"AVD Start Error");
QMessageBox::critical(Core::ICore::dialogParent(), title,
QString::fromLatin1(avdProcess->readAllStandardOutput()));
const QString errorOutput = QString::fromLatin1(avdProcess->readAllStandardOutput());
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [errorOutput] {
const QString title
= QCoreApplication::translate("Android::Internal::AndroidAvdManager",
"AVD Start Error");
QMessageBox::critical(Core::ICore::dialogParent(), title, errorOutput);
});
}
avdProcess->deleteLater();
});