diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2010-01-21 15:27:01 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2010-01-21 15:27:01 (GMT) |
| commit | 7d6180f906ee50c10b27db722f55974f0f3a0ef4 (patch) | |
| tree | 9a9c1a5e000a76afdada46cf411fd4a13bd12bcc /tools/runonphone/main.cpp | |
| parent | 9bbaea4318dd41c9e2fd27fbc1eeec931e372d4f (diff) | |
| download | Qt-7d6180f906ee50c10b27db722f55974f0f3a0ef4.zip Qt-7d6180f906ee50c10b27db722f55974f0f3a0ef4.tar.gz Qt-7d6180f906ee50c10b27db722f55974f0f3a0ef4.tar.bz2 | |
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
Diffstat (limited to 'tools/runonphone/main.cpp')
| -rw-r--r-- | tools/runonphone/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp index 77bd809..a77e713 100644 --- a/tools/runonphone/main.cpp +++ b/tools/runonphone/main.cpp @@ -203,8 +203,8 @@ int main(int argc, char *argv[]) QObject::connect(launcher.data(), SIGNAL(applicationOutputReceived(const QString &)), &handler, SLOT(applicationOutputReceived(const QString &))); QObject::connect(launcher.data(), SIGNAL(copyProgress(int)), &handler, SLOT(copyProgress(int))); QObject::connect(launcher.data(), SIGNAL(stateChanged(int)), &handler, SLOT(stateChanged(int))); - QObject::connect(launcher.data(), SIGNAL(stopped(uint,uint,uint,QString)), &handler, SLOT(stopped(uint,uint,uint,QString))); - QObject::connect(&handler, SIGNAL(resume(uint,uint)), launcher.data(), SLOT(resume(uint,uint))); + QObject::connect(launcher.data(), SIGNAL(processStopped(uint,uint,uint,QString)), &handler, SLOT(stopped(uint,uint,uint,QString))); + QObject::connect(&handler, SIGNAL(resume(uint,uint)), launcher.data(), SLOT(resumeProcess(uint,uint))); QObject::connect(&handler, SIGNAL(terminate()), launcher.data(), SLOT(terminate())); QObject::connect(launcher.data(), SIGNAL(finished()), &handler, SLOT(finished())); |