diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-05 06:53:54 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-05 06:53:54 (GMT) |
| commit | 3d0b7905b18ada0e22e77b9c6670069dfd454adc (patch) | |
| tree | 9f9110260bb0b2b26011883397e37c1860412173 /tools/runonphone/main.cpp | |
| parent | 6d290ae51ee928aecb87be57326504aab8d7f177 (diff) | |
| parent | ae205367d7af4bb86279386af6d9fea6f726915b (diff) | |
| download | Qt-3d0b7905b18ada0e22e77b9c6670069dfd454adc.zip Qt-3d0b7905b18ada0e22e77b9c6670069dfd454adc.tar.gz Qt-3d0b7905b18ada0e22e77b9c6670069dfd454adc.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/runonphone/main.cpp')
| -rw-r--r-- | tools/runonphone/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp index 7767e4b..93b087b 100644 --- a/tools/runonphone/main.cpp +++ b/tools/runonphone/main.cpp @@ -51,6 +51,7 @@ #include "trksignalhandler.h" #include "serenum.h" +#include "ossignalconverter.h" void printUsage(QTextStream& outstream, QString exeName) { @@ -235,6 +236,8 @@ int main(int argc, char *argv[]) QObject::connect(&handler, SIGNAL(getRegistersAndCallStack(uint,uint)), launcher.data(), SLOT(getRegistersAndCallStack(uint,uint))); QObject::connect(launcher.data(), SIGNAL(finished()), &handler, SLOT(finished())); + QObject::connect(OsSignalConverter::instance(), SIGNAL(terminate()), launcher.data(), SLOT(terminate()), Qt::QueuedConnection); + QTimer timer; timer.setSingleShot(true); QObject::connect(&timer, SIGNAL(timeout()), &handler, SLOT(timeout())); |