feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,813 Commits 108 Branches 368 Tags
1d1d2f0b748e33caaa78d9b14fb34847cd0323f7
Commit Graph

52 Commits

Author SHA1 Message Date
Christiaan Janssen
95f1bb190f QmlProfiler: scroll automatically when selecting events out of view 
Change-Id: I2f242895b00792d2e6930ec642209be886e22bad
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-02-03 17:09:50 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Christiaan Janssen
1958fd82d5 QmlProfiler: reading column information in bindings 
Change-Id: I1a99c3508de733d98eb99f41419eccfdca030fe0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-20 12:18:50 +01:00
Christiaan Janssen
5fede0d497 QmlProfiler: tooltips for the labels column 
Due to space restrictions, the descriptive text of events
in the labels column of the timeline view are elided.  This
patch adds tooltips on mouseover with location and details.

Change-Id: I229988e114f21e4d9575dff137aa91918ad1afa3
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-13 11:28:43 +01:00
Christiaan Janssen
72c06cb6fd QmlProfiler: timers for all profiler activities 
Change-Id: I2ecbf4d1d90e353506e7c164560b69b81fcc6c66
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-12-07 10:46:01 +01:00
Christiaan Janssen
1cd6972ac8 QmlProfiler: minor adjustments to timeline UI 
Change-Id: I74460d9a32ced707fa4a550199bba5f5906f417e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-12-05 10:10:40 +01:00
Christiaan Janssen
8c64d132fd QmlProfiler: improved look of the timeline UI 
Change-Id: I5d79394529f3ba303e7353a60df77f59bbe38a12
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-11-24 13:53:05 +01:00
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
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
bddfae7182 QmlProfiler: refactor postprocess step in internal statistics 
Change-Id: Id6ea03161ccad92a27a664e84f56b2a49400be91
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-09 16:34:17 +01:00
Christiaan Janssen
71763310ad QmlProfiler: center event on clicked in details 
Change-Id: I6e81089b3014f15545be4c40e0909ff2a37dbe1b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-04 14:56:54 +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
6a988ee8ac QmlProfiler: fixed bug in elapsed display when finishing trace 
Change-Id: I85c376b45eb6308c4af4e80032e37379b12ef8e0
Reviewed-on: http://codereview.qt-project.org/6425
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-11 12:21:09 +02:00
Christiaan Janssen
a3d0b084a5 QmlProfiler: changes in rangedetails and selection of items 
Change-Id: Ic665596cd4f01459b69738363b64ee3b9e5d5b74
Reviewed-on: http://codereview.qt-project.org/6327
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-10 17:27:35 +02:00
Christiaan Janssen
ce633d57fb QmlProfiler: make strings translatable 
Task-number: QTCREATORBUG-5747

Change-Id: If15bb749e641ed181dbfee3400c18d52bc88e5fb
Reviewed-on: http://codereview.qt.nokia.com/3188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-18 16:30:41 +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
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
Christiaan Janssen
d319065645 QmlProfiler: rendering event information popup next to cursor 
Task-number: QTCREATORBUG-5538
Change-Id: I6cb4ac6924eda2588657dbea0d51166ad0c01340
Reviewed-on: http://codereview.qt.nokia.com/1948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 15:27:22 +02:00
Christiaan Janssen
ef58d3e40b QmlProfiler: avoid reference to connection in UI 
The reference to the "connection" instance can become a dangling pointer.

Change-Id: Icde6fed39d19f35420904f718d12931d297d1511
Reviewed-on: http://codereview.qt.nokia.com/1934
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 12:08:39 +02:00
Christiaan Janssen
b533cea366 QmlProfiler: removed old fps code 
Change-Id: If9ae003d1e6204450f931b72c950525b0b476f74
Reviewed-on: http://codereview.qt.nokia.com/1602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-13 16:04:38 +02:00
Christiaan Janssen
01cc659ffd QmlProfiler: displaying events only when available 
Change-Id: I65414168804fb9673793409bd66deec501944c75
Reviewed-on: http://codereview.qt.nokia.com/1601
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-13 15:51:02 +02:00
Christiaan Janssen
54d9374a2e QmlProfiler: Visual feedback 
Change-Id: Ib0d50b0699a6553079c84bbc8d67ecc3c3397bc2
Reviewed-on: http://codereview.qt.nokia.com/1594
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-13 15:23:11 +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
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
Christiaan Janssen
79311f273a QmlProfiler: nesting events in the timeline view 
Change-Id: I6bc534a7fc02cb8c647dfc90a78b698592719a91
Reviewed-on: http://codereview.qt.nokia.com/843
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-28 17:09:05 +02:00
Christiaan Janssen
17db97b698 QmlProfiler: show ranges in time display 
Change-Id: I6f42db3d5de02ee0198ff51aae8421bbdc5ea9c4
Reviewed-on: http://codereview.qt.nokia.com/836
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-28 16:35:32 +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
98ed0164c5 QmlProfiler: clean up old code 
Change-Id: Id464b073eb05341e48876ace9ff39e16d6302144
Reviewed-on: http://codereview.qt.nokia.com/530
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-21 10:01:04 +02:00
Christiaan Janssen
b7796436a2 QmlProfiler: time display 
Change-Id: Ib1a0e7693f00e3d870407c62f7f238c962ef8b48
Reviewed-on: http://codereview.qt.nokia.com/529
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-21 10:00:50 +02:00
Christiaan Janssen
96fe0cf503 QmlProfiler: adjust timeline background to width 
Change-Id: Ice7fd81994dd93571fa2f172cbaa611a55f07721
Reviewed-on: http://codereview.qt.nokia.com/528
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-21 10:00:24 +02:00
Christiaan Janssen
5f53cc41d8 QmlProfiler: Event details stay when mouseExit 
Change-Id: I506eb085f0c2bf1970c9a56d2838f94931bce1f0
Reviewed-on: http://codereview.qt.nokia.com/489
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-21 10:00:21 +02:00
Christiaan Janssen
bc04a3b385 QmlProfiler: set clip in timelineview 
Otherwise the user can mouseover events that are not displayed.

Change-Id: I8108cfbf730708bbad4a6d2cc812ee1b3a1a444a
Reviewed-on: http://codereview.qt.nokia.com/457
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 17:13:37 +02:00
Christiaan Janssen
020b86a8c9 QmlProfiler: start timeline at 0 
Change-Id: Id42f2dd156863c8cfa19ce27f03b862c512b6b57
Reviewed-on: http://codereview.qt.nokia.com/456
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 17:13:12 +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
d835b769c7 QmlProfiler: removed fixed height 2011-05-17 18:04:25 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christiaan Janssen
d5ad4e8dd4 QmlProfiler: reset timer on clear output 
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