Kai Koehne
e249265a96
QmlProfiler: Don't let timer run if we cannot connect to port
...
Previously the timer was started as soon as we connect, but we
should actually make sure the service is there.
Change-Id: Ic59ccb4a402a54dc1fc1f0c92ca2f80dad436581
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com >
2011-11-11 12:51:44 +01:00
Eike Ziller
85cf2b661e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
Christiaan Janssen
886e613572
QmlProfiler: nonzero trace starttimes
...
Change-Id: I734c1af79a4975f5f331f212721331ea877b391a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
2011-11-03 12:48:18 +01:00
hjk
31600758de
all: s/info@qt.nokia.com/qt-info@nokia.com/
...
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2011-11-03 10:33:19 +01:00
Christiaan Janssen
bc4d15f3c6
QmlProfiler: use end of trace event if present
...
Change-Id: I149a05500fd4bc722da3c409491b35304155828b
Reviewed-on: http://codereview.qt-project.org/6436
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
2011-10-11 14:52:57 +02:00
Kai Koehne
38d84d5b6a
QmlProfiler: Don't emit recordingChanged signal if service gets enabled
...
Change-Id: I1cba56b92d83edb2ed54b731f9815c77d04cfd9e
Reviewed-on: http://codereview.qt.nokia.com/3500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com >
2011-08-24 16:10:26 +02:00
Christiaan Janssen
d2911d70f3
QmlProfiler: New event list with caching, load, save
...
Change-Id: I640a16649156a49f2d7e7006d6b2ea38fe218620
Reviewed-on: http://codereview.qt.nokia.com/3043
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
2011-08-17 12:33:39 +02:00
Kai Koehne
478ba05474
QmlProfilerTraceClient: Cleanup
...
Move private members into d pointer, remove unused signal,
rename clearView() method & clear() signal to clearData(), dataCleared()
Change-Id: I0baf78107861a469185c736fc448b4d3a7929cdd
Reviewed-on: http://codereview.qt.nokia.com/2691
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
2011-08-05 14:08:29 +02:00
Kai Koehne
687a60065a
QmlJSDebugClient: Move QmlProfilerTraceClient into library
...
Change-Id: I1c0821778a3350ec55741b45680fca2cb1fed3aa
Reviewed-on: http://codereview.qt.nokia.com/2680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com >
2011-08-05 12:17:30 +02:00
