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

Compile fix with Qt 4

Browse Source 
Change-Id: Iae87c5c9c19de1bf7fc5e4d354f96f0365315324
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-09-05 13:09:44 +02:00
parent 527046acc2
commit 0126672336
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,7 +231,7 @@ void AndroidDeployStep::cleanLibsOnDevice()
arguments << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/tmp/qt"); arguments << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/tmp/qt");
connect(process, SIGNAL(finished(int)), this, SLOT(processFinished())); connect(process, SIGNAL(finished(int)), this, SLOT(processFinished()));
const QString adb = AndroidConfigurations::instance().adbToolPath().toString(); const QString adb = AndroidConfigurations::instance().adbToolPath().toString();
MessageManager::write(adb + QLatin1Char(' ') + arguments.join(QLatin1Char(' '))); MessageManager::write(adb + QLatin1Char(' ') + arguments.join(QLatin1String(" ")));
process->start(adb, arguments); process->start(adb, arguments);
if (!process->waitForStarted(500)) if (!process->waitForStarted(500))
delete process; delete process;
@@ -288,7 +288,7 @@ void AndroidDeployStep::installQASIPackage(const QString &packagePath)
connect(process, SIGNAL(finished(int)), this, SLOT(processFinished())); connect(process, SIGNAL(finished(int)), this, SLOT(processFinished()));
const QString adb = AndroidConfigurations::instance().adbToolPath().toString(); const QString adb = AndroidConfigurations::instance().adbToolPath().toString();
MessageManager::write(adb + QLatin1Char(' ') + arguments.join(QLatin1Char(' '))); MessageManager::write(adb + QLatin1Char(' ') + arguments.join(QLatin1String(" ")));
process->start(adb, arguments); process->start(adb, arguments);
if (!process->waitForFinished(500)) if (!process->waitForFinished(500))
delete process; delete process;