diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-12-02 13:56:56 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-12-03 14:01:24 +0000 |
| commit | 23de4630fc477090b0695224a9e7f63e89b0e541 (patch) | |
| tree | 64a596805566434041d6ed5494254a9b0ed083d6 | |
| parent | 0f239f6c48b59c1f0c9a9b93558be6ec2482669a (diff) | |
| download | qt-creator-23de4630fc477090b0695224a9e7f63e89b0e541.tar.gz | |
Android: Fix pid type
PIDs on Android (also on linux) are int64 not int
Change-Id: I6611361d4f7ab66018b3174e8fe64a41fa111350
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/android/androidrunner.h | 2 | ||||
| -rw-r--r-- | 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 257b40cadd..ae0bf865cf 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 d8e0726c1b..86defe19ce 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 ead26eed70..ae43200d8d 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); |