From 817f99d3eee90fb7b33c27472f0b4801717a411e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 5 Dec 2013 23:44:33 -0800
Subject: [PATCH] Fix abuse of QProcess::error

It's invalid to call it if no previous function returned an error. Don't
rely on undefined behavior. Instead, simply check if waitForFinished()
returned false, which is what this code intended to do anyway.

Change-Id: I67903ba65e86ff1d1810481b2bd5724ab99a4b76
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/android/androiddeploystep.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index 42ddbf125da..29b77b06ed1 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -281,8 +281,7 @@ unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestin
     QStringList arguments = AndroidDeviceInfo::adbSelector(m_deviceSerialNumber);
     arguments << QLatin1String("ls") << destination;
     process.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments);
-    process.waitForFinished(5000);
-    if (process.error() != QProcess::UnknownError
+    if (!process.waitForFinished(5000)
             || process.exitCode() != 0)
         return -1;
     QByteArray output = process.readAll();