aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.3'qp-v3.4.2qp-v3.4.1qp-v3.4.0-rc1qp-v3.4.0qp-3.4Eike Ziller2015-02-1313-52/+52
|\ | | | | | | Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b
| * Update Licenseqp-v3.3.2qp-v3.3.1qp-3.3Eike Ziller2015-01-1613-52/+52
| | | | | | | | | | Change-Id: I2ba997eac9d3ff75542b5861dbbc89d3ccd6017e Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Fix qbs build.Christian Kandeler2014-12-181-0/+1
| | | | | | | | | | Change-Id: Ie15b7a5d952b1221153e24c08f5f906076d19bf1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Define separate methods for getting collapsed and expanded rowsUlf Hermann2014-12-058-17/+35
| | | | | | | | | | Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-11-262-0/+27
|\| | | | | | | | | | | | | Conflicts: plugins/qmlprofilerextension/memoryusagemodel.cpp Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4
| * Add qbs project file.qp-v3.3.0-rc1qp-v3.3.0Christian Kandeler2014-11-251-0/+26
| | | | | | | | | | Change-Id: If583799f3dfd09c6c5c49ee8305c0df8b038881a Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| * Properly initialize max size in memory usage modelUlf Hermann2014-11-241-0/+2
| | | | | | | | | | Change-Id: Id77917c92191d3970727be0b360abefc87254c5b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove useless checks in labels() methodsUlf Hermann2014-11-214-61/+41
| | | | | | | | | | | | | | The view should do those. Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Adapt to splitting of AbstractTimelineModelUlf Hermann2014-11-219-33/+34
| | | | | | | | | | Change-Id: Ib39831448262c5c4329b0f13f62e20d4c3ea73b6 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Create extension models through a factoryUlf Hermann2014-11-219-43/+39
| | | | | | | | | | | | | | | | 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>
* | Adapt to switching of typeId and selectionIdUlf Hermann2014-11-218-56/+80
| | | | | | | | | | Change-Id: I2aa918232b688bb84690fb8ee10753aa04804d7c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Don't use AbstractTimelineModel's private classUlf Hermann2014-11-218-344/+254
| | | | | | | | | | | | | | | | We can easily implement all needed functionality with only the public interface. Change-Id: Ibf22f2e4bc27a8b506f0164e0e1fdf529b1a9e45 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Adapt to merging of AbstractTimelineModel and SortedTimelineModelUlf Hermann2014-11-214-22/+22
| | | | | | | | | | Change-Id: I13cbcf98934daef075080a8bf27d505a673103cf Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove unused includesUlf Hermann2014-11-212-2/+0
| | | | | | | | | | Change-Id: I3b65fc0537392130e6adb2370f4051cdcec3d7c5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Use TraceTime for determining trace start/end timesUlf Hermann2014-11-212-6/+9
|/ | | | | Change-Id: Iacd43d12e9fcd0561a3835b91bba56d7058a35f2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add texture deletion events to scene graph profilerqp-v3.3.0-beta1Ulf Hermann2014-10-161-1/+8
| | | | | | | | It seems those were forgotten when the scene graph profiler was refactored. Change-Id: I4cf5f1cae701ec4ff64659bd023fb5941715e7e1 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Implement the input events modelUlf Hermann2014-10-152-7/+88
| | | | | Change-Id: Ifae1ac725518d1a7fb12b46bd36485cd46ebf082 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Use QT_TRANSLATE_NOOP to mark translatable strings in arraysUlf Hermann2014-10-151-22/+22
| | | | | Change-Id: Id24ca60a8166394811e0ff93f5bd1d3e198ac67e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Improve appearance of Scene Graph profiler.Ulf Hermann2014-10-151-77/+93
| | | | | | | | | | 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>
* Store typeIds in range dataUlf Hermann2014-09-293-32/+47
| | | | | Change-Id: I09e9481296cbd0429858df893de902c63891b430 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Rename eventId to typeId and selectionIdUlf Hermann2014-09-297-11/+11
| | | | | Change-Id: Id28186a5e24c9b0f6f89142ba4c35d1a5a462852 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Show full path when hovering over labels in pixmap cache profilerUlf Hermann2014-09-231-0/+1
| | | | | | | This helps if you have multiple pixmaps with equal names. Change-Id: I39a16f55d16c5729483c037b8c125795105fae0a Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-161-5/+7
|\ | | | | | | | | | | | | Conflicts: plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp Change-Id: Ied74b2e97a51bd5ee67864e6dd5c830d57ea3099
| * Hide features for new "Indie" licenseqp-v3.2.2qp-v3.2.1qp-3.2Kai Koehne2014-09-081-4/+6
| | | | | | | | | | | | | | This requires http://qt-gerrit.it.local/#change,6220 in licensechecker.git Change-Id: Ia7bc7bcee90d3099805a43106f1f0b695bbf059b Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* | Respect the "hidden" property when generating labelsUlf Hermann2014-09-153-3/+3
| | | | | | | | | | Change-Id: I96a40813ad8aebcb86ddc9ed08327fe836681267 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Make loadData() and clear() protectedUlf Hermann2014-09-153-0/+3
| | | | | | | | | | Change-Id: I1c31d5463ae39b988c7a0ffb4168a952e53c152c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Centralize rowCount calculationUlf Hermann2014-09-156-37/+3
| | | | | | | | | | Change-Id: I6e159702e533848c9eb9c98551743d5472f2155c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Report supported features from timeline modelsUlf Hermann2014-09-1510-5/+126
| | | | | | | | | | | | | | Also add a stub input events model to represent that feature. Change-Id: Idd05b9452b7c6920779e72966ce62c0a1decaeef Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Rename relative height of items in timeline to "relativeHeight"Ulf Hermann2014-09-114-4/+4
| | | | | | | | | | Change-Id: I3fb0d91dafbb42b0422263b6710b1a0fcb4c193c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Rename "Glyph Count" to just "Glyphs"Ulf Hermann2014-09-081-1/+1
| | | | | | | | | | | | | | It means the same but is shorter and doesn't get elided. Change-Id: I0ef221bb844691b9c15a3c10743bfd7389fe95ae Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Don't resolve the type ID twice when coloring scene graph eventsUlf Hermann2014-09-081-1/+1
| | | | | | | | | | Change-Id: Ib396f4a28ddcfc5a4d95beb4a22dbd109d06b38e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix typo in scene graph modelUlf Hermann2014-09-081-1/+1
| | | | | | | | | | Change-Id: Ifef5ac0b3ffa05b17d6f17adf8a8c2f745a98e1c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove unused addVP() method from PixmapCacheModelUlf Hermann2014-09-081-10/+0
| | | | | | | | | | Change-Id: I31c8eea2b9e21247e83ef0e5d23b0b568b1f177c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Move to JSON plugin meta dataEike Ziller2014-09-022-13/+15
| | | | | | | | | | Change-Id: Ie028a6b1e5e2e01acba235f76aa431a9875fa984 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Remove unnecessary Q_EXPORT_PLUGINEike Ziller2014-08-261-2/+0
| | | | | | | | | | | | Change-Id: I0e5da4f829be1d94a32b73a6383e0ddf5c69dd33 Reviewed-by: Andre Poenitz <andre.poenitz@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* | Adapt to new class hierarchy for AbstractTimelineModelUlf Hermann2014-08-263-105/+106
| | | | | | | | | | Change-Id: I432e334cee3cfc97970224c0f61213dc4f0a2cc2 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Change the scene graph profiler to give more accurate informationUlf Hermann2014-08-262-175/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Simplify range detailsUlf Hermann2014-08-266-78/+42
| | | | | | | | | | | | | | | | 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>
* | Adapt to renaming of get* and find* methodsUlf Hermann2014-08-266-46/+45
| | | | | | | | | | Change-Id: I470bcaaf53a6184ae35369484337b247bf17f52e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Rename occurrences of "title" to "displayName"Ulf Hermann2014-08-263-6/+5
| | | | | | | | | | Change-Id: Ic26122d319dd56a4666a02bf6979c292581473ea Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Adapt to removal of name from AbstractTimelineModelUlf Hermann2014-08-263-11/+6
| | | | | | | | | | Change-Id: I7747ea5f8485795ad7777fa2f411afcff01956f8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-08-152-53/+68
|\| | | | | | | Change-Id: Ifa2b9350ed68b42a04f589368492d318548dc7e2
| * Be more verbose about aggregated memory allocationsqp-v3.2.0Ulf Hermann2014-07-112-26/+56
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Use fewer QVariantMaps to create memory event detailsUlf Hermann2014-07-111-31/+16
| | | | | | | | | | Change-Id: Ief0b14ae2be15bf5e9db31d8f6625882a17f685a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Show correct wording for memory eventsUlf Hermann2014-07-111-1/+1
| | | | | | | | | | | | | | For delta < 0 it's "freed", not "allocated Change-Id: I1ac400588329152f70d63a2ec4a0498c6f54d299 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge branch '3.2'Ulf Hermann2014-07-092-2/+17
|\| | | | | | | Change-Id: I15f9db0dd9d65ceaff9503c535abd7abcbd1eccc
| * Fix PixmapCacheModel to not get confused on plain LoadingFinishedUlf Hermann2014-07-091-0/+15
| | | | | | | | | | | | | | | | | | | | 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>
| * Replace lastTimeMark with traceEndTime for end time of memory profilerUlf Hermann2014-07-091-2/+2
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-07-041-0/+5
|\| | | | | | | Change-Id: I1a26f3e2fb838df2d3df1784d6a8ea65fbcf4418
| * Make it clear that the numbers in the pixmap scale are pixelsqp-v3.2.0-beta1Ulf Hermann2014-07-021-0/+5
| | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 04:58:55 +0000