summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-03-13 14:46:58 +0100
committerUlf Hermann <ulf.hermann@digia.com>2014-03-17 14:12:21 +0100
commit08eaa92085f53051b18ebfdf664b1e9b5d487579 (patch)
tree1a60fd8f3ca48ae1137161c16196f63199016a48
parente2ac45bf7ee8ff18a5971537a60c75bd33212937 (diff)
downloadqt-creator-08eaa92085f53051b18ebfdf664b1e9b5d487579.tar.gz
QmlProfiler: Fix logic when timeout-connecting to QML port
The timeout signal doesn't contain the QML port but we might know it if we've explicitly set it. The previous logic makes no sense at all. Change-Id: I820255e492e919ee916a5f859d7809a6c5233399 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerengine.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 7876245763..2246832422 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -258,7 +258,9 @@ void QmlProfilerRunControl::processIsRunning(quint16 port)
{
d->m_noDebugOutputTimer.stop();
- if (port > 0 && startParameters().analyzerPort != 0)
+ if (port == 0)
+ port = startParameters().analyzerPort;
+ if (port != 0)
emit processRunning(port);
}