aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@nokia.com>2011-11-02 15:59:17 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-03 16:01:53 +0100
commit31ce3cb4ebb78ca67ef050a6282e8b4d5b1cedac (patch)
treea17a77ac5c1e6375f5cdf629a8144cff665dd13c
parent92b420a041fe2dbdb792344ce8822a9690e398a7 (diff)
QmlProfiler: Send trace start event when starting profiling
Change-Id: Ic81c99922f73b0bf9ee830adc2fe35f1c154d868 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace.cpp18
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace_p.h1
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
};