From 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Mon, 13 Jun 2016 18:42:42 -0400 Subject: Imported Upstream version 3.1.0 --- Plugins/DbAndroid/adbmanager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Plugins/DbAndroid/adbmanager.h') diff --git a/Plugins/DbAndroid/adbmanager.h b/Plugins/DbAndroid/adbmanager.h index adeca90..6bd70d3 100644 --- a/Plugins/DbAndroid/adbmanager.h +++ b/Plugins/DbAndroid/adbmanager.h @@ -29,8 +29,8 @@ class AdbManager : public QObject QString findAdb(); bool testCurrentAdb(); bool testAdb(const QString& adbPath, bool quiet = false); - bool execBytes(const QStringList& arguments, QByteArray* stdOut = nullptr, QByteArray* stdErr = nullptr); - bool exec(const QStringList& arguments, QString* stdOut = nullptr, QString* stdErr = nullptr); + bool execBytes(const QStringList& arguments, QByteArray* stdOut = nullptr, QByteArray* stdErr = nullptr, bool forceSafe = false); + bool exec(const QStringList& arguments, QString* stdOut = nullptr, QString* stdErr = nullptr, bool forceSafe = false); static QByteArray encode(const QString& input); static QString decode(const QByteArray& input); -- cgit v1.2.3