Commit Graph

131 Commits

Author SHA1 Message Date
Kai Koehne
b3e4cf2032 Make licensechecker dependency optional
Change-Id: Ibf66800bac5f674fb015f4aaf3923b824651e75b
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-06-25 16:32:10 +03:00
Ulf Hermann
ac4162d459 Specify the source json.in in the .pro, not the compiled json
Change-Id: If5e8da39ac05b30d80646d13a5dd1d4144805ba3
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-26 15:21:36 +02:00
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
Christian Kandeler
a18c411c37 Fix qbs build.
Change-Id: Ie15b7a5d952b1221153e24c08f5f906076d19bf1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:50:05 +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
Christian Kandeler
bfc37d6973 Add qbs project file.
Change-Id: If583799f3dfd09c6c5c49ee8305c0df8b038881a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2014-11-25 11:15:41 +02: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
5ac685bdfa Remove unused includes
Change-Id: I3b65fc0537392130e6adb2370f4051cdcec3d7c5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-21 14:50:06 +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
6438cacf1a Add texture deletion events to scene graph profiler
It seems those were forgotten when the scene graph profiler was
refactored.

Change-Id: I4cf5f1cae701ec4ff64659bd023fb5941715e7e1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-16 09:45:59 +03:00
Ulf Hermann
660478b4c8 Implement the input events model
Change-Id: Ifae1ac725518d1a7fb12b46bd36485cd46ebf082
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-15 12:25:03 +03:00
Ulf Hermann
63f5ccfc11 Use QT_TRANSLATE_NOOP to mark translatable strings in arrays
Change-Id: Id24ca60a8166394811e0ff93f5bd1d3e198ac67e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-15 12:24:52 +03:00
Ulf Hermann
7ae08a61b1 Improve appearance of Scene Graph profiler.
It shouldn't display 0-size timings and it should distinguish the
threads more clearly. Also, we display the gross render time in
addition to the render time breakdown. This seems to be rather
important information for users.

Change-Id: I3c1d94f1489902a815c20831e8e1059c815ef129
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-15 12:24:40 +03: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
b429a98f15 Show full path when hovering over labels in pixmap cache profiler
This helps if you have multiple pixmaps with equal names.

Change-Id: I39a16f55d16c5729483c037b8c125795105fae0a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-09-23 13:58:35 +03:00
Eike Ziller
3b74cda11a Merge remote-tracking branch 'origin/3.2'
Conflicts:
	plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp

Change-Id: Ied74b2e97a51bd5ee67864e6dd5c830d57ea3099
2014-09-16 15:20:38 +02: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
fdb2e04dd1 Make loadData() and clear() protected
Change-Id: I1c31d5463ae39b988c7a0ffb4168a952e53c152c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 12:29:25 +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
Kai Koehne
61065b9a99 Hide features for new "Indie" license
This requires http://qt-gerrit.it.local/#change,6220 in licensechecker.git

Change-Id: Ia7bc7bcee90d3099805a43106f1f0b695bbf059b
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-08 13:49:44 +03:00
Ulf Hermann
f430b10868 Rename "Glyph Count" to just "Glyphs"
It means the same but is shorter and doesn't get elided.

Change-Id: I0ef221bb844691b9c15a3c10743bfd7389fe95ae
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-08 11:26:20 +03:00
Ulf Hermann
1ee5799e7e Don't resolve the type ID twice when coloring scene graph events
Change-Id: Ib396f4a28ddcfc5a4d95beb4a22dbd109d06b38e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-08 11:25:29 +03:00
Ulf Hermann
4cb16afcf0 Fix typo in scene graph model
Change-Id: Ifef5ac0b3ffa05b17d6f17adf8a8c2f745a98e1c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-08 11:24:58 +03:00
Ulf Hermann
56f46c1d30 Remove unused addVP() method from PixmapCacheModel
Change-Id: I31c8eea2b9e21247e83ef0e5d23b0b568b1f177c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-08 11:24:43 +03:00
Eike Ziller
fe07078373 Move to JSON plugin meta data
Change-Id: Ie028a6b1e5e2e01acba235f76aa431a9875fa984
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-02 16:15:50 +03:00
Eike Ziller
300265cf67 Remove unnecessary Q_EXPORT_PLUGIN
Change-Id: I0e5da4f829be1d94a32b73a6383e0ddf5c69dd33
Reviewed-by: Andre Poenitz <andre.poenitz@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-08-26 16:51:06 +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
af151a0a68 Change the scene graph profiler to give more accurate information
The scene graph profiler was pretty barren. The ranges it showed were
only vaguely related to actual events and the numbers shown in the
labels weren't really informative.

This change shows every stage in GUI thread and rendering thread as its
own range, so that you can easily see now if a particular stage takes
unusually long. This comes at a cost, though: The color is used for
showing event types instead of frame rates now and there is no 1:1
mapping of rows to threads anymore. The first row is still reserved
for the GUI thread and the second one for the render thread. Further
rows are used as needed, though, and you can meaningfully expand the
category now.

Task-number: QTBUG-39876
Change-Id: Ib91ba454dd0e3e7482ca2afe6d3c80d9868bcce3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-08-26 15:53:51 +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
114c1dbc88 Fix PixmapCacheModel to not get confused on plain LoadingFinished
The indices SortedTimelineModel returns are only valid until you insert
something at a different place than the end. If you do that, all later
events are shifted by one. We can "fix" that by also shifting the saved
indices.

Change-Id: I63180dabea0c52db55e799b023b3f2bf84f9e59a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-09 13:52:13 +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
8c260ba1a6 Make it clear that the numbers in the pixmap scale are pixels
By showing the same numbers with units in the labels we avoid leading
people to assume bytes as unit.

Change-Id: I56d2ca5f21434fd24a305aebd434371438da7ebb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-02 15:37:00 +03:00
Ulf Hermann
fafe9b116c Fix switched times for windows render loop.
Task-number: QTBUG-39876
Change-Id: I01c15ede43a9d94fdfc3123b6df8a235430cfc81
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-02 12:24:33 +03:00