Merge from upstream

The patch accepted upstream has the signal and slot renamed, so there
is a corresponding change to main.cpp

commit 53c672fb9853fef5a00285213084f02a4253e5f3
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Thu Jan 21 15:45:40 2010 +0100

trk: Handle TrkNotifyStopped in launcher.

Add signal and static utility functions to parse message.
Reviewed-by:  Robert Loehning <robert.loehning@nokia.com>
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>

Task-number: QTBUG-7444

1 files changed, 8 insertions, 2 deletions

diff --git a/tools/runonphone/trk/launcher.h b/tools/runonphone/trk/launcher.h
index 472f234..8dc6ebe 100644
--- a/tools/runonphone/trk/launcher.h
+++ b/tools/runonphone/trk/launcher.h
@@ -111,6 +111,12 @@ public:
 
     static QByteArray startProcessMessage(const QString &executable,
                                           const QStringList &arguments);
+    // Parse a TrkNotifyStopped message
+    static bool parseNotifyStopped(const QByteArray &a,
+                                   uint *pid, uint *tid, uint *address,
+                                   QString *why = 0);
+    // Helper message
+    static QString msgStopped(uint pid, uint tid, uint address, const QString &why);
 
 signals:
     void copyingStarted();
@@ -128,11 +134,11 @@ signals:
     void applicationOutputReceived(const QString &output);
     void copyProgress(int percent);
     void stateChanged(int);
-    void stopped(uint pc, uint pid, uint tid, const QString& reason);
+    void processStopped(uint pc, uint pid, uint tid, const QString& reason);
 
 public slots:
     void terminate();
-    void resume(uint pid, uint tid);
+    void resumeProcess(uint pid, uint tid);
 
 private slots:
     void handleResult(const trk::TrkResult &data);