aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2015-11-26 10:48:28 +0100
committerUlf Hermann <[email protected]>2015-11-30 08:58:02 +0000
commitb9adbffe6fffe940547a5add209474bfea07167a (patch)
treead1a5973d198099b55a95f9ab9855c476276d3a6 /src
parent1e58db55b3342b45aa1edc94b75438a378266747 (diff)
Debugger: Proactively try to connect to QML port in mixed engine
Just like with the QML-only engine we might not get the output for a variety of reasons. As we've specified the port on the command line, it's likely that the application will start listening at some point, though. Change-Id: Ifda69ba15c659cf95e708d35bed34cfb9b3c40ec Task-number: QTCREATORBUG-15409 Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/debugger/qml/qmlengine.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index c4b6fcf7c77..c76b23e53ac 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -355,10 +355,8 @@ void QmlEngine::tryToConnect(quint16 port)
if (state() == EngineRunRequested) {
if (isSlaveEngine()) {
// Probably cpp is being debugged and hence we did not get the output yet.
- if (!masterEngine()->isDying()) {
- d->noDebugOutputTimer.setInterval(4000);
- d->noDebugOutputTimer.start();
- }
+ if (!masterEngine()->isDying())
+ beginConnection(port);
else
appStartupFailed(tr("No application output received in time"));
} else {