Merge remote-tracking branch 'origin/4.8'

Change-Id: I5b18233936e3b2cd674df92a694ba73b5a3ed752
2018-12-02 22:07:22 +02:00
parent c9a48ad5b1 f0226d9644
commit 7096649fc2
28 changed files with 242 additions and 70 deletions
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -73,7 +73,8 @@ signals:

 protected:
    void asyncStartHelper();
-    bool startDebuggerServer(QString packageDir, QString *errorStr = nullptr);
+    bool startDebuggerServer(const QString &packageDir, const QString &gdbServerPrefix,
+                             const QString &gdbServerExecutable, QString *errorStr = nullptr);

    enum class JDBState {
        Idle,