feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
141 Commits 108 Branches 368 Tags
b3e4cf2032fe9899caac60ceb7029ca33ce68771
Commit Graph

33 Commits

Author SHA1 Message Date
Eike Ziller
5fef8a9d91 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b
 2015-02-13 09:38:33 +01:00
Eike Ziller
ce38b0379f Update License 
Change-Id: I2ba997eac9d3ff75542b5861dbbc89d3ccd6017e
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
 2015-01-16 09:48:02 +02:00
Ulf Hermann
ff45f1c156 Define separate methods for getting collapsed and expanded rows 
Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-05 15:16:28 +02:00
Eike Ziller
848336251a Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	plugins/qmlprofilerextension/memoryusagemodel.cpp

Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4
 2014-11-26 11:18:54 +01:00
Ulf Hermann
d821009822 Properly initialize max size in memory usage model 
Change-Id: Id77917c92191d3970727be0b360abefc87254c5b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-24 19:35:49 +02:00
Ulf Hermann
fad69ea995 Remove useless checks in labels() methods 
The view should do those.

Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:41 +02:00
Ulf Hermann
d93266420b Adapt to splitting of AbstractTimelineModel 
Change-Id: Ib39831448262c5c4329b0f13f62e20d4c3ea73b6
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:35 +02:00
Ulf Hermann
fd09a6bed2 Create extension models through a factory 
Like that we can drop the deferred setting of model manager and we can
announce the features right away on construction.

Change-Id: I8b4eb3e94046511b0e637084768e919649115e77
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:30 +02:00
Ulf Hermann
b398ccb738 Adapt to switching of typeId and selectionId 
Change-Id: I2aa918232b688bb84690fb8ee10753aa04804d7c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:25 +02:00
Ulf Hermann
bfbad9b941 Don't use AbstractTimelineModel's private class 
We can easily implement all needed functionality with only the public
interface.

Change-Id: Ibf22f2e4bc27a8b506f0164e0e1fdf529b1a9e45
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:21 +02:00
Ulf Hermann
587caba5e7 Adapt to merging of AbstractTimelineModel and SortedTimelineModel 
Change-Id: I13cbcf98934daef075080a8bf27d505a673103cf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:15 +02:00
Ulf Hermann
304ce44cb5 Use TraceTime for determining trace start/end times 
Change-Id: Iacd43d12e9fcd0561a3835b91bba56d7058a35f2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:49:59 +02:00
Ulf Hermann
f70cbad9b1 Store typeIds in range data 
Change-Id: I09e9481296cbd0429858df893de902c63891b430
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-29 14:07:42 +03:00
Ulf Hermann
009b1bd437 Rename eventId to typeId and selectionId 
Change-Id: Id28186a5e24c9b0f6f89142ba4c35d1a5a462852
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-29 14:07:05 +03:00
Ulf Hermann
83be08fe41 Respect the "hidden" property when generating labels 
Change-Id: I96a40813ad8aebcb86ddc9ed08327fe836681267
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-15 12:29:31 +03:00
Ulf Hermann
2aff8c4ea9 Centralize rowCount calculation 
Change-Id: I6e159702e533848c9eb9c98551743d5472f2155c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-15 12:29:20 +03:00
Ulf Hermann
4f0e720893 Report supported features from timeline models 
Also add a stub input events model to represent that feature.

Change-Id: Idd05b9452b7c6920779e72966ce62c0a1decaeef
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-15 12:29:13 +03:00
Ulf Hermann
2360ecb657 Rename relative height of items in timeline to "relativeHeight" 
Change-Id: I3fb0d91dafbb42b0422263b6710b1a0fcb4c193c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-11 12:47:48 +03:00
Ulf Hermann
e32fff5b5a Adapt to new class hierarchy for AbstractTimelineModel 
Change-Id: I432e334cee3cfc97970224c0f61213dc4f0a2cc2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:54:41 +03:00
Ulf Hermann
ae07d0624c Simplify range details 
Adapt to the new signature of the details method and don't create
unnecessary nested maps.

Change-Id: Iab8d31e48d35923fee3e258c0390459a81ece746
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:53:21 +03:00
Ulf Hermann
b7cd23a466 Adapt to renaming of get* and find* methods 
Change-Id: I470bcaaf53a6184ae35369484337b247bf17f52e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:52:00 +03:00
Ulf Hermann
2c4214825c Rename occurrences of "title" to "displayName" 
Change-Id: Ic26122d319dd56a4666a02bf6979c292581473ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:51:33 +03:00
Ulf Hermann
1a4371080b Adapt to removal of name from AbstractTimelineModel 
Change-Id: I7747ea5f8485795ad7777fa2f411afcff01956f8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:50:20 +03:00
Ulf Hermann
80d938c6a3 Be more verbose about aggregated memory allocations 
The memory profiler aggregates allocations originating from the same
QML/JS constructs into one event. This change makes sure the origins
are really the same calls, not only the same functions and gives some
more details on hom much memory was allocated or deallocated in how
many steps.

Change-Id: I784c521855122f7b3b894417de0afb216766e2d4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-11 15:07:17 +03:00
Ulf Hermann
2d93a34d18 Use fewer QVariantMaps to create memory event details 
Change-Id: Ief0b14ae2be15bf5e9db31d8f6625882a17f685a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-11 15:05:46 +03:00
Ulf Hermann
4d820f05f6 Show correct wording for memory events 
For delta < 0 it's "freed", not "allocated

Change-Id: I1ac400588329152f70d63a2ec4a0498c6f54d299
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-11 14:54:50 +03:00
Ulf Hermann
ef51b12f99 Replace lastTimeMark with traceEndTime for end time of memory profiler 
lastTimeMark is just the end of the last recorded event. The memory
will still be allocated after that.

Change-Id: Ica12993d7b1572c145bba6373461240a5e846fa9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-09 13:52:06 +03:00
Ulf Hermann
3a5340e1a8 Group memory usage events by their cause and add location information 
Change-Id: Id33fa51daffe97e9e60467942b92f0598a17c27d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-02 12:21:16 +03:00
Ulf Hermann
7eca9fbc42 Add scale to memory usage and pixmap cache models 
Change-Id: I69cb67a97b0bb3407f509db01ec2d4b9acd177db
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-02 12:20:10 +03:00
Ulf Hermann
7f0b2b4087 Remove redundant displayNames 
There is no point in showing a displayName that's the same as the
description.

Change-Id: Ie6ace79e622e31b87ff42d741e04103a920b36e4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-02 12:16:57 +03:00
Ulf Hermann
71f04e35d7 Adapt to centralization of type data. 
Change-Id: Ie2ad2f7ab326adb88334b3bd686cbde0f25f1a83
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-18 15:56:46 +03:00
Ulf Hermann
14babc5395 Derive from AbstractTimelineModel instead of SingleCategoryTimelineModel 
Change-Id: I720f067956417519e58fac9d92292edd7968356d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-17 17:53:25 +03:00
Ulf Hermann
8e4445302a Memory usage model 
An additional model to represent memory usage of the application being
profiled.

Change-Id: I5f1e1e06a31adf2e4ba0bb63147492b6b5f50a3e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-17 17:53:19 +03:00