2 files changed, 12 insertions, 7 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index 6ccfbb3f1b..a9cdfac6b7 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -267,16 +267,20 @@ void QDeclarativeDebugTrace::messageReceived(const QByteArray &message)
     QByteArray rwData = message;
     QDataStream stream(&rwData, QIODevice::ReadOnly);
 
-    bool wasEnabled = m_enabled;
-    stream >> m_enabled;
+    bool enabled;
+    stream >> enabled;
 
     m_messageReceived = true;
 
-    if (!m_enabled && wasEnabled) {
-        m_enabled = true;
-        addEvent(EndTrace);
-        m_enabled = false;
-        sendMessages();
+    if (m_enabled != enabled) {
+        if (enabled) {
+            m_enabled = true;
+            addEvent(StartTrace);
+        } else {
+            addEvent(EndTrace);
+            m_enabled = false;
+            sendMessages();
+        }
     }
 }
 
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index 26535e1676..81bcf5d848 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -102,6 +102,7 @@ public:
         Key,
         AnimationFrame,
         EndTrace,
+        StartTrace,
 
         MaximumEventType
     };