From 5a1f825cff01943d08c10b527aae546af646a81d Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 12 Jan 2010 10:50:37 +1000
Subject: [PATCH] Fix bug where the qmlinspector tries to connect to the debug
server before it has started.
---
src/plugins/qmlprojectmanager/qmlproject.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 8725e4fb788..328ceee54bb 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -555,11 +555,6 @@ bool QmlRunControl::isRunning() const
void QmlRunControl::slotBringApplicationToForeground(qint64 pid)
{
- if (m_debugMode) {
- Core::ICore *core = Core::ICore::instance();
- core->modeManager()->activateMode(QLatin1String("QML_INSPECT_MODE"));
- }
-
bringApplicationToForeground(pid);
}
@@ -571,6 +566,11 @@ void QmlRunControl::slotError(const QString &err)
void QmlRunControl::slotAddToOutputWindow(const QString &line)
{
+ if (m_debugMode && line.startsWith("QmlDebugServer: Waiting for connection")) {
+ Core::ICore *core = Core::ICore::instance();
+ core->modeManager()->activateMode(QLatin1String("QML_INSPECT_MODE"));
+ }
+
emit addToOutputWindowInline(this, line);
}
--
GitLab