From d75d70c5520fb7ecbe3fdb6911eecb5ad0eb2061 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 27 Feb 2012 10:04:34 +0100
Subject: [PATCH] Debugger: Fix "attach to QML port"
In this case we don't get any application output / message
telling us that the server is waiting, so let's try to connect
directly.
This is a regression introduced in commit 742019e3017
Change-Id: I85d9f846c72e8b227dae5d6e847ab9366a34e2cc
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
src/plugins/debugger/qml/qmlengine.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index d2beefce3a6..541d7b37d87 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -412,7 +412,9 @@ void QmlEngine::runEngine()
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
if (!isSlaveEngine()) {
- if (startParameters().startMode != AttachToRemoteServer)
+ if (startParameters().startMode == AttachToRemoteServer)
+ beginConnection();
+ else
startApplicationLauncher();
}
}
--
GitLab