From 23de4630fc477090b0695224a9e7f63e89b0e541 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 2 Dec 2019 13:56:56 +0200 Subject: [PATCH] Android: Fix pid type PIDs on Android (also on linux) are int64 not int Change-Id: I6611361d4f7ab66018b3174e8fe64a41fa111350 Reviewed-by: Cristian Adam --- src/plugins/android/androidrunner.cpp | 2 +- src/plugins/android/androidrunner.h | 2 +- src/plugins/android/androidrunnerworker.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 257b40cadd6..ae0bf865cff 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -224,7 +224,7 @@ void AndroidRunner::remoteErrorOutput(const QString &output) } void AndroidRunner::handleRemoteProcessStarted(Utils::Port gdbServerPort, - const QUrl &qmlServer, int pid) + const QUrl &qmlServer, qint64 pid) { m_pid = ProcessHandle(pid); m_gdbServerPort = gdbServerPort; diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index d8e0726c1b4..86defe19ce9 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -72,7 +72,7 @@ private: void remoteOutput(const QString &output); void remoteErrorOutput(const QString &output); void gotRemoteOutput(const QString &output); - void handleRemoteProcessStarted(Utils::Port gdbServerPort, const QUrl &qmlServer, int pid); + void handleRemoteProcessStarted(Utils::Port gdbServerPort, const QUrl &qmlServer, qint64 pid); void handleRemoteProcessFinished(const QString &errString = QString()); void checkAVD(); void launchAVD(); diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h index ead26eed705..ae43200d8df 100644 --- a/src/plugins/android/androidrunnerworker.h +++ b/src/plugins/android/androidrunnerworker.h @@ -64,7 +64,7 @@ public: void handleJdbSettled(); signals: - void remoteProcessStarted(Utils::Port gdbServerPort, const QUrl &qmlServer, int pid); + void remoteProcessStarted(Utils::Port gdbServerPort, const QUrl &qmlServer, qint64 pid); void remoteProcessFinished(const QString &errString = QString()); void remoteOutput(const QString &output);