diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-16 16:42:56 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-16 16:46:03 +0100 |
| commit | 65c169c80ee14d98a220c5d665f8e86b2630ec71 (patch) | |
| tree | e8b5f3754d978044d4986541a695d54458af91c2 /src/plugins/android/androidrunner.h | |
| parent | 72e3605a01394fe2f67ea159f757a4d5a1c3ab90 (diff) | |
| parent | 6ec9dd10a5d8e232687c850b83d89c1746dc34e5 (diff) | |
| download | qt-creator-65c169c80ee14d98a220c5d665f8e86b2630ec71.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidrunner.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
Diffstat (limited to 'src/plugins/android/androidrunner.h')
| -rw-r--r-- | src/plugins/android/androidrunner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index cbe9656ccc..24be23db8b 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -55,7 +55,8 @@ public: public slots: void start(); - void stop(); + void stop(bool async); + void asyncStop(); signals: void remoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1); |