feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix pid type

Browse Source 
PIDs on Android (also on linux) are int64 not int

Change-Id: I6611361d4f7ab66018b3174e8fe64a41fa111350
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
BogDan Vatra
2019-12-02 13:56:56 +02:00
committed by BogDan Vatra
parent 0f239f6c48
commit 23de4630fc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidrunner.cpp
View File

@@ -224,7 +224,7 @@ void AndroidRunner::remoteErrorOutput(const QString &output)
} }
void AndroidRunner::handleRemoteProcessStarted(Utils::Port gdbServerPort, void AndroidRunner::handleRemoteProcessStarted(Utils::Port gdbServerPort,
const QUrl &qmlServer, int pid) const QUrl &qmlServer, qint64 pid)
{ {
m_pid = ProcessHandle(pid); m_pid = ProcessHandle(pid);
m_gdbServerPort = gdbServerPort; m_gdbServerPort = gdbServerPort;

2
src/plugins/android/androidrunner.h
View File

@@ -72,7 +72,7 @@ private:
void remoteOutput(const QString &output); void remoteOutput(const QString &output);
void remoteErrorOutput(const QString &output); void remoteErrorOutput(const QString &output);
void gotRemoteOutput(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 handleRemoteProcessFinished(const QString &errString = QString());
void checkAVD(); void checkAVD();
void launchAVD(); void launchAVD();

2
src/plugins/android/androidrunnerworker.h
View File

@@ -64,7 +64,7 @@ public:
void handleJdbSettled(); void handleJdbSettled();
signals: 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 remoteProcessFinished(const QString &errString = QString());
void remoteOutput(const QString &output); void remoteOutput(const QString &output);