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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	doc/src/editors/creator-only/creator-code-pasting.qdoc
	src/plugins/android/androidbuildapkwidget.cpp

Change-Id: Iea8b7135643d14ffe49d10b14bedb8fa5ac48063
This commit is contained in:
Eike Ziller
2018-10-24 13:58:45 +02:00
parent bc5e640a46 d1430c9542
commit fd7cba88ef
81 changed files with 316 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -62,7 +62,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
m_step(step)
{
m_ui->setupUi(this);
setDisplayName(tr("<b>Build Android APK</b>"));
setDisplayName("<b>" + tr("Build Android APK" + "</b>"));
setSummaryText(displayName());
// Target sdk combobox
@@ -225,8 +225,8 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
BuildStepConfigWidget(step),
m_step(step)
{
setDisplayName(tr("<b>Build Android APK</b>"));
setSummaryText(tr("<b>Build Android APK</b>"));
setDisplayName("<b>" + tr("Build Android APK" + "</b>"));
setSummaryText("<b>" + tr("Build Android APK" + "</b>"));
m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);