feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,942 Commits 108 Branches 368 Tags
21124e927f658b9aa36ba926924083de34d9e5c5
Commit Graph

47 Commits

Author SHA1 Message Date
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
d09b3b903d QmlProfiler: link selections in events and timeline views 
Change-Id: I1fb511fdb77e7c74f66624fcc88c2e0ce9adb457
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-10 11:03:43 +01:00
Christiaan Janssen
c4694275fb QmlProfiler: option to get statistics from local region 
Change-Id: Id11cce971b081d67052dd8e7c74f51e2e25a8fd8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-10 10:21:44 +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
bf4dfd5e74 QmlProfiler: optimized timeline display 
Change-Id: I0d7cf110356ef5f805b81a5fc39dca3870765ea3
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-02 10:14:09 +01:00
Christiaan Janssen
3a4710e780 QmlProfiler: updated zoom controls 
Change-Id: I3e09e0879a44f1dbf03f3989267aaf79c959526f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-01 17:01:55 +01:00
Christiaan Janssen
267b96e18e QmlProfiler: Selection Range 
Change-Id: Ifa39de4762c05dc859cbd764a10760a82821d74f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-01 16:33:58 +01:00
Christiaan Janssen
c9f977c39a QmlProfiler: main view with fixed height and scrollable 
Change-Id: Ib77ad6ba5afe13d692d85c7027e3e1d4b2fbb6a7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-01 15:13:39 +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
Christiaan Janssen
a26259997c QmlProfiler: V8 profiling 
Change-Id: I926c5821d31453064f5dbed2b5a10f6195761f42
Reviewed-on: http://codereview.qt-project.org/5892
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-07 17:19:50 +02:00
Kai Koehne
749534ea76 QmlProfiler: Move EventList to qmljsdebugclient library 
Change-Id: Icbd24ffeb51db0f098d8fe9c62a0a889a722f760
Reviewed-on: http://codereview.qt.nokia.com/3222
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-22 09:12:02 +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
Kai Koehne
bb41109b0e QmlJSDebugClient: Fix style & indentation 
Change-Id: I87bdb465816fc68f83f6c5e097c9d9b853614b94
Reviewed-on: http://codereview.qt.nokia.com/2672
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-05 12:17:16 +02:00
Christiaan Janssen
5003e78bef QmlProfiler: correctly displaying status when recording disabled 
Each time a new profiling session is started, the root component
is reloaded.  If Plotter.ranges contains data, which might be
the case when not recording, the count in the root item should
not be reset to 0, and the dataAvailable flag stay to true.

Change-Id: I2a34e30a4ae7179d3675b62792dcae7b9eba0462
Reviewed-on: http://codereview.qt.nokia.com/2118
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-25 17:16:58 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Christiaan Janssen
8658d6f1c6 QmlProfiler: Tooltips 
Change-Id: Ie83698aa10f27989b56b0032d04c416e34f1ded4
Reviewed-on: http://codereview.qt.nokia.com/1182
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-05 18:11:42 +02:00
Christiaan Janssen
7756371cea QmlProfiler: disable navigation buttons when no data 
Change-Id: Ieee8a4c45919c4598d86a817e3489bd3e519d1c8
Reviewed-on: http://codereview.qt.nokia.com/1181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-05 18:10:45 +02:00
Kai Koehne
5525e7d20d QmlProfiler: Rename TracePlugin to QmlProfileTraceClient 
Also move it into it's own file.

Change-Id: If063b0a4c6642b1e209e6a0026fedffd01603eb9
Reviewed-on: http://codereview.qt.nokia.com/841
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-28 17:04:48 +02:00
Christiaan Janssen
faaf318634 QmlProfiler: zoom in and out controls 
Change-Id: I920aae3075269e4f2fd1be15e9ca3cc4e08ac7a7
Reviewed-on: http://codereview.qt.nokia.com/826
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-28 14:31:02 +02:00
Christiaan Janssen
2b8920405d QmlProfiler: Next and Previous controls 
Change-Id: Iedac6ee9f3cc9855a5825fc5f82b79a06da4f1fb
Reviewed-on: http://codereview.qt.nokia.com/767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-28 09:59:59 +02:00
Christiaan Janssen
9baa4f51a1 QmlProfiler: Clear button in toolbar 
Change-Id: Id9739b7828b080b016aa41b13b4f5313a2319172
Reviewed-on: http://codereview.qt.nokia.com/750
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-27 12:54:54 +02:00
Christiaan Janssen
13cb0b6df3 QmlProfiler: Dependencies view 
Change-Id: I1172d66b8e577994df787e2bb14cdd03a2affb35
Reviewed-on: http://codereview.qt.nokia.com/613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-23 15:23:36 +02:00
Christiaan Janssen
74f1c2e277 QmlProfiler: removed scrollbar, timeline stretches automatically 
Change-Id: Ibc012d517556914e61ccbf58245a6d83cb4c8a80
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 15:35:09 +02:00
Christiaan Janssen
ccd9354c29 QmlProfiler: renamed from "Perfomance Monitor" to "Profiler" 
Change-Id: I00e051f810fb147775c925f0e2378a46d660967e
Reviewed-on: http://codereview.qt.nokia.com/423
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 14:35:22 +02:00
hjk
f7fee744b9 qmlprofiler: ui and style 
Change-Id: I2153ef00f8d3c6d1cc4d39648916cad865b5a9be
Reviewed-on: http://codereview.qt.nokia.com/54
Reviewed-by: hjk
 2011-05-23 14:57:03 +02:00
hjk
cc645911c1 qmlprofiler: use dockwidgets instead of tabs in the output pane 
Change-Id: I2c33c4309e6568a34517fae2bb37f5e70320cfbe
Reviewed-on: http://codereview.qt.nokia.com/35
Reviewed-by: hjk
 2011-05-23 14:56:36 +02:00
Christiaan Janssen
d835b769c7 QmlProfiler: removed fixed height 2011-05-17 18:04:25 +02:00
Christiaan Janssen
9a92079c11 QmlProfiler: fix warning in MSVC compiler 
Reviewed-by: Tobias Hunger
 2011-05-16 15:12:34 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christiaan Janssen
50516bed66 QmlProfiler: corrected display name 
Reviewed-by: Friedemann Kleint
 2011-04-26 15:57:03 +02:00
Christiaan Janssen
4fc3990b53 QmlProfiler: fixed connection reset when new application starts 
Reviewed-by: Kai Koehne
 2011-04-15 17:31:21 +02:00
Kai Koehne
5fee646b5b QmlProfiler: Make use of QSharedPointer for TracePlugin 
THe plugin might be deleted when the client is deleted.
 2011-04-14 17:36:45 +02:00
Kai Koehne
20cb599b8c QmlProfiler: Remove use of Qt private headers 
Use the copy of QDeclarativeDebugClient we ship with qtcreator.
However, since the internal one misses a waitForConnected any connection
will right now fail.
 2011-04-14 17:36:44 +02:00
Christiaan Janssen
fa2b294264 QmlProfiler: stop timer on failed connection 
Reviewed-by: Kai Koehne
 2011-04-14 15:25:58 +02:00
Christiaan Janssen
6ab68a1a5f QmlProfiler: added summary view 
Reviewed-by: Kai Koehne
 2011-04-08 13:35:38 +02:00
Christiaan Janssen
e838a3dd7c QmlProfiler: added 'clear view' 
Reviewed-by: Kai Koehne
 2011-04-06 16:08:51 +02:00
Christiaan Janssen
fad891820d qQmlProfiler: independent start/stop/record buttons 
Reviewed-by: Kai Koehne
 2011-04-06 12:59:29 +02:00
Kai Koehne
fe876b5580 QmlProfiler: Fix typo 2011-04-04 15:57:21 +02:00
Kai Koehne
3ffe2e0354 QmlProfiler: Move qrc resources in qmlprofiler namespace 2011-04-04 15:57:21 +02:00
Thorbjørn Lindeijer
f6c2528122 Don't use OpenGL for the QML profiler trace window 
Using an OpenGL widget causes Qt to revert back to native widgets for
everything, which causes flicker.

Software rendering should be fast enough anyway and work more reliable
in general.

Reviewed-by: Kai Koehne
 2011-03-31 15:47:15 +02:00
Kai Koehne
d8f83e2b1b QmlProfiler: Add license headers 2011-03-25 17:20:27 +01:00
Kai Koehne
ac61c9a918 QmlProfiler: Namespace fixes 
Use own namespace (QmlProfiler) instead of Analyzer.
 2011-03-25 09:21:00 +01:00
Christiaan Janssen
fbe9925d8c QmlProfiler: ongoing work 2011-03-24 15:42:43 +01:00
Christiaan Janssen
f774556de7 QmlProfiler: first commit 2011-03-24 11:07:59 +01:00