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

Use IDE_DISPLAY_NAME

Browse Source 
Change-Id: If8ae9399a40a460b535faeec2320d1450e5099c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Robert Loehning
2020-07-31 17:41:28 +02:00
parent 4bfdc125ef
commit 64a641ec6a
7 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -31,6 +31,8 @@
#include "androidmanager.h"
#include "adbcommandswidget.h"
#include <app/app_version.h>
#include <projectexplorer/buildsystem.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h>
@@ -123,7 +125,8 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
warning->setDisplayStyle(BaseStringAspect::LabelDisplay);
warning->setLabelPixmap(Icons::WARNING.pixmap());
warning->setValue(tr("If the \"am start\" options conflict, the application might not start.\n"
"Qt Creator uses: am start -n <package_name>/<Activity_name> [-D]."));
"%1 uses: am start -n <package_name>/<Activity_name> [-D].")
.arg(Core::Constants::IDE_DISPLAY_NAME));
auto preStartShellCmdAspect = addAspect<BaseStringListAspect>();
preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST);

4
src/plugins/android/androidsdkmanagerwidget.cpp
View File

@@ -29,6 +29,7 @@
#include "androidsdkmanager.h"
#include "androidsdkmodel.h"
#include <app/app_version.h>
#include <utils/runextensions.h>
#include <utils/outputformatter.h>
#include <utils/runextensions.h>
@@ -168,8 +169,9 @@ void AndroidSdkManagerWidget::installEssentials()
if (!m_sdkModel->missingEssentials().isEmpty()) {
QMessageBox::warning(this,
tr("Android SDK Changes"),
tr("Qt Creator couldn't find the following essential packages: \"%1\".\n"
tr("%1 couldn't find the following essential packages: \"%2\".\n"
"Install them manually after the current operation is done.\n")
.arg(Core::Constants::IDE_DISPLAY_NAME)
.arg(m_sdkModel->missingEssentials().join("\", \"")));
}
onApplyButton();