feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
37,857 Commits 108 Branches 368 Tags
8c080e909a01d1cf35d9afc33af4f0e078bd321c
Commit Graph

116 Commits

Author SHA1 Message Date
Kai Koehne
0599cb7366 QmlProfiler: Avoid drawing outside of widget 
Avoid rendering outside of the canvas by forcing the windows
size onto the scene, and also removing the related candidateSize
logic.

In the QtQUick1 based profiler one could scroll the canvas also
vertically, but that doesn't work any more. This is a hot fix
to work around the problem, we can hopefully bring back the
full solution later ...

Change-Id: Ibd3d54f6b98c3764e104116d395a77b880d88bcb
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-05 10:32:33 +01:00
Aurindam Jana
c9a851c649 QmlProfiler: Avoid generic property types in QML 
Change-Id: I4dddf19d37004f59bfbe75b45e0b626bf1563fa2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-09-18 10:37:33 +02:00
Aurindam Jana
a2d771b41e QmlProfiler: Update Qt Quick 2.0 to Quick 2.1 
Change-Id: Ib40cf370798e12540d81e2f7ec532bb119293e4e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-09-18 10:37:21 +02:00
Thomas Hartmann
9e58ab2ac8 QmlProfiler: Initial conversion from Quick 1 to Quick 2 
Updated class names and functions. Fixed imports.

Change-Id: I5f12e3a108a0e60c091acc9c415ff77e52118029
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-09-16 14:35:53 +02:00
Christiaan Janssen
0a3b20f5f9 QmlProfiler: reworked 
Change-Id: I66a236a024d76e7bef6edfb91ae30b5dd098b76b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-09 17:19:32 +02:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Christiaan Janssen
f1f8706578 QmlProfiler: state dialog as floating widget 
Change-Id: I48ff1d729e49347881c82c7bd066d30ecaca47a5
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2012-05-21 12:15:21 +02:00
Christiaan Janssen
af72e4bb3f QmlProfiler: show empty trace 
In the case that the application did not generate any event
after running the profiler, still show an empty trace.
Otherwise the user will think that the profiler didn't work.

Change-Id: Idd15225270d55d834719f66387864433fcb9026d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-05-11 17:16:12 +02:00
Christiaan Janssen
b7304e2f2e QmlProfiler: Refactor 
The code of the qmlprofiler client has become a bit too complex,
this patch reorganizes the modules in a more sensible way,
having the modules communicate with each other through a
state machine instead of the excess of signals and slots
from before.

Change-Id: I76f7313779888a1bd07a1cdb1acbf2e47aacf42a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-03-14 11:38:25 +01:00
Christiaan Janssen
1322a73efd QmlProfiler: read trace when application ended by the user 
This patch avoids showing the "use the stop button" if the
application dies but the trace data was sent in time.

Note: with the current implementation in Qt5, the application
sometimes closes before all data could be sent.  That happens
with any non-trivial qml application.

Change-Id: Ie7b1568b2d69320d1887587dccac40a4b4d4d788
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-02-17 17:25:00 +01:00
Christiaan Janssen
585e651310 QmlProfiler: manage server-side start tracing message 
also
QmlProfiler: refactor eventlist state

If unexpected data is received, assuming server stopped profiling.
Also, introducing a eventlist state instead of relying on
signals sent around.  This is part of a coming bigger patch
where the profiler client is refactored.

Change-Id: Ibed9007903956daf03cc0fcb90f77b5ad2d3cf90
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-02-17 17:22:23 +01:00
Christiaan Janssen
bd438d1c5c QmlProfiler: display binding loops 
Change-Id: Ib553f67b25e614bd210959ce82bc970daa228fdb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-02-08 16:02:17 +01:00
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