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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-10-29 08:17:05 +01:00
parent cd041f3f93 b926435576
commit 242b7bd209
155 changed files with 3464 additions and 2565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androidconfigurations.cpp
View File

@@ -44,6 +44,7 @@
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/session.h>
#include <debugger/debuggeritemmanager.h>
#include <debugger/debuggerkitinformation.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>

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

@@ -336,7 +336,7 @@ void AndroidDeployQtStep::runCommand(const QString &program, const QStringList &
QString mainMessage = tr("Packaging Error: Command '%1 %2' failed.")
.arg(program).arg(arguments.join(QLatin1String(" ")));
if (buildProc.error() != QProcess::UnknownError)
mainMessage += tr(" Reason: %1").arg(buildProc.errorString());
mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc.errorString());
else
mainMessage += tr("Exit code: %1").arg(buildProc.exitCode());
emit addOutput(mainMessage, BuildStep::ErrorMessageOutput);

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

@@ -239,7 +239,7 @@ bool AndroidDeployStep::runCommand(QProcess *buildProc,
QString mainMessage = tr("Packaging Error: Command '%1 %2' failed.")
.arg(program).arg(arguments.join(QLatin1String(" ")));
if (buildProc->error() != QProcess::UnknownError)
mainMessage += tr(" Reason: %1").arg(buildProc->errorString());
mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc->errorString());
else
mainMessage += tr("Exit code: %1").arg(buildProc->exitCode());
writeOutput(mainMessage, BuildStep::ErrorMessageOutput);

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

@@ -613,7 +613,7 @@ bool AndroidPackageCreationStep::createPackage()
emit addOutput(tr("Copy Qt app & libs to Android package ..."), MessageOutput);
QStringList build;
build << QLatin1String("-silent");
// build << QLatin1String("-silent"); //TODO depends on ant 1.9.0, enabled, not *now*
build << QLatin1String("clean");
QFile::remove(m_gdbServerDestination.toString());
if (m_signPackageForRun) {
@@ -803,7 +803,7 @@ bool AndroidPackageCreationStep::runCommand(QProcess *buildProc
QString mainMessage = tr("Packaging Error: Command '%1 %2' failed.")
.arg(program).arg(arguments.join(QLatin1String(" ")));
if (buildProc->error() != QProcess::UnknownError)
mainMessage += tr(" Reason: %1").arg(buildProc->errorString());
mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc->errorString());
else
mainMessage += tr("Exit code: %1").arg(buildProc->exitCode());
raiseError(mainMessage);