OSDN Git Service
(root)
/
qt-creator-jp
/
qt-creator-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
00d4e21
)
S60: Increase timeout for TRK prompt.
author
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Fri, 30 Oct 2009 13:00:08 +0000
(14:00 +0100)
committer
con
<qtc-committer@nokia.com>
Fri, 30 Oct 2009 16:07:48 +0000
(17:07 +0100)
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
(cherry picked from commit
3a64a1035759efcc260f13ebe467d41da39f028b
)
src/shared/trk/launcher.cpp
patch
|
blob
|
history
diff --git
a/src/shared/trk/launcher.cpp
b/src/shared/trk/launcher.cpp
index
a554269
..
b9b5f04
100644
(file)
--- a/
src/shared/trk/launcher.cpp
+++ b/
src/shared/trk/launcher.cpp
@@
-201,7
+201,7
@@
bool Launcher::startServer(QString *errorMessage)
}
setState(Connecting);
// Set up the temporary 'waiting' state if we do not get immediate connection
- QTimer::singleShot(
2
00, this, SLOT(slotWaitingForTrk()));
+ QTimer::singleShot(
10
00, this, SLOT(slotWaitingForTrk()));
d->m_device->sendTrkInitialPing();
d->m_device->sendTrkMessage(TrkDisconnect); // Disconnect, as trk might be still connected
d->m_device->sendTrkMessage(TrkSupported, TrkCallback(this, &Launcher::handleSupportMask));