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

String improvements

Browse Source 
Change-Id: I45778c9562ba530a36ddaf201f0c61d380d701cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-01-05 14:21:59 +01:00
parent 0d9fa1c714
commit 18aa49e7c2
11 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidbuildapkwidget.ui
View File

@@ -154,7 +154,7 @@
</property>
<property name="text">
<string>Signing an APK that uses &quot;Deploy local Qt libraries&quot; is not allowed.
Deploying local Qt libraries is incompatible with Android 5</string>
Deploying local Qt libraries is incompatible with Android 5.</string>
</property>
</widget>
</item>

2
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -361,7 +361,7 @@ void AndroidDeployQtStep::runCommand(const QString &program, const QStringList &
if (!buildProc.waitForFinished(2 * 60 * 1000)
|| buildProc.error() != QProcess::UnknownError
|| buildProc.exitCode() != 0) {
QString mainMessage = tr("Packaging Error: Command \"%1 %2\" failed.")
QString mainMessage = tr("Packaging error: Command \"%1 %2\" failed.")
.arg(program).arg(arguments.join(QLatin1Char(' ')));
if (buildProc.error() != QProcess::UnknownError)
mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc.errorString());