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

AndroidDeployStep: Adjust to MessageManager api change

Browse Source 
Also since the deploystep runs in the background do not force a mode
switch.

Change-Id: I5deb4eb09f331e31d153f828ebadfa3ae4387ac2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-03-12 16:36:42 +01:00
parent 547a57e7eb
commit ceba2fc0e4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ void AndroidDeployStep::cleanLibsOnDevice()
int deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt();
QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel);
if (!deviceSerialNumber.length()) {
Core::MessageManager::instance()->printToOutputPanePopup(tr("Could not run adb. No device found."));
Core::MessageManager::instance()->printToOutputPane(tr("Could not run adb. No device found."), Core::MessageManager::NoModeSwitch);
return;
}
QProcess *process = new QProcess(this);
@@ -180,8 +180,9 @@ void AndroidDeployStep::cleanLibsOnDevice()
arguments << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/tmp/qt");
connect(process, SIGNAL(finished(int)), this, SLOT(cleanLibsFinished()));
const QString adb = AndroidConfigurations::instance().adbToolPath().toString();
Core::MessageManager::instance()->printToOutputPanePopup(adb + QLatin1String(" ")
+ arguments.join(QLatin1String(" ")));
Core::MessageManager::instance()->printToOutputPane(adb + QLatin1String(" ")
+ arguments.join(QLatin1String(" ")),
Core::MessageManager::NoModeSwitch);
process->start(adb, arguments);
}
@@ -190,8 +191,9 @@ void AndroidDeployStep::cleanLibsFinished()
QProcess *process = qobject_cast<QProcess *>(sender());
if (!process)
return;
Core::MessageManager::instance()->printToOutputPanePopup(QString::fromLocal8Bit(process->readAll()));
Core::MessageManager::instance()->printToOutputPane(tr("adb finished with exit code %1.").arg(process->exitCode()));
Core::MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(process->readAll()), Core::MessageManager::NoModeSwitch);
Core::MessageManager::instance()->printToOutputPane(tr("adb finished with exit code %1.").arg(process->exitCode()),
Core::MessageManager::NoModeSwitch);
}
void AndroidDeployStep::setDeployAction(AndroidDeployStep::AndroidDeployAction deploy)