aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare for merging into qtcreatorqp-masterUlf Hermann2016-01-2230-25/+1
| | | | | | | | Remove the licensechecker dependency, move everything into src/plugins/qmlprofilerextension, and adapt the build system. Change-Id: I58bf34ecd838514d02b5c50189cd8a5eb99793b0 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Remove dependency on licensecheckerUlf Hermann2016-01-223-20/+1
| | | | | Change-Id: I806983db89468f39dc781e9fd082f862b335a0d8 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Initialize rangeTypeMaskUlf Hermann2016-01-211-1/+1
| | | | | Change-Id: I3b778b774e0b19c9d697f460200853798eea16c9 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add missing resource file to qbs project.Christian Kandeler2016-01-201-0/+1
| | | | | Change-Id: I674779a04f1a4e0e10715b6003a029a42ca3f8e0 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Fix qbs build.Christian Kandeler2016-01-141-0/+1
| | | | | Change-Id: I9774978d3531dea118a8bb27d17c23cb8e906c5a Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Change license terms to commercial or GPL.Ulf Hermann2016-01-1424-216/+349
| | | | | | Change-Id: I928769fa86f1ac5c489918bf2da3c691054a0459 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Add flamegraph viewUlf Hermann2016-01-0612-1/+779
| | | | | Change-Id: I001053b63d27adcbbdfd95abb2b45f5f5fa05447 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add flamegraph modelUlf Hermann2016-01-064-2/+450
| | | | | Change-Id: I0c5b837dd649f95495ef2ef36523d455a59103f4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add missing override to quieten warningTobias Hunger2015-12-181-1/+1
| | | | | Change-Id: Ibb14de894ae9e9c3eae367895fb03590ccb061d9 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Avoid using API introduced in Qt 5.5Ulf Hermann2015-11-234-13/+28
| | | | | | | | | | Especially, QMetaEnum::fromType() and friends. Tracking which kinds of messages were actually generated is better anyway, as we don't get empty rows like this. Change-Id: I23c560d9071c0ff5a33dff660e4dbb1552890df8 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add debug messages modelUlf Hermann2015-11-175-3/+196
| | | | | Change-Id: Ib62f1c6b2d1c28a3b4e06ee93cbc35d30074ce02 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Adapt to changes in QmlEventDataUlf Hermann2015-11-174-65/+65
| | | | | Change-Id: I2d01bb8b6684c9a9e3b2c4146f2101c31c7b0fa1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Revert "Revert "Properly clear input events model""Eike Ziller2015-11-171-0/+1
| | | | | | | | The revert was only for 3.6 branch. This reverts commit eec2b2d0ee4f606511c997d083e5cbe404df6ddd. Change-Id: Id338a078ff5265d5517b935a1056a8e1c7d652c7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-11-171-1/+0
|\ | | | | | | Change-Id: Ic042c3dee945b1a0104c492e21ba34842cdea3fa
| * Revert "Properly clear input events model"qp-v3.6.0-rc1qp-v3.6.0qp-3.6Ulf Hermann2015-11-171-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit d1d694efb55229f4862affe174c0f1643153a9cf. It should have gone to the master branch. Change-Id: I1c5b86caf5092e1d5d1ac9866e2887a912b1c65e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-11-171-0/+1
|\| | | | | | | Change-Id: Ia0f2227bf86fb9d52ab2ec4f687554e0540a0117
| * Properly clear input events modelUlf Hermann2015-11-161-0/+1
| | | | | | | | | | Change-Id: I17b7e84605f93d421de7dcf0a0b02c6b922b2c4b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Translate strings in input events modelUlf Hermann2015-11-161-18/+18
| | | | | | | | | | Change-Id: Ia549295adafa42b9236f568c04e52b48e8943337 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add some more information to input events, if availableUlf Hermann2015-11-052-3/+76
|/ | | | | | | Just "Mouse" or "Key" is not very helpful. Change-Id: Ia5db293fb957242aa0a7a84440cd1632d2babe8a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix that licensechecker was never usedqp-v3.6.0-beta1Eike Ziller2015-10-012-1/+2
| | | | | Change-Id: I3d2d1df976fc7cdb7795df8742092e3ef00500b4 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Adapt to removal of QQmlProfilerBaseModelUlf Hermann2015-09-113-3/+3
| | | | | Change-Id: Ic71b73f4a31d86d04e0c346a45b3506d07895ebc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Rename files to follow common pattern among extension pluginsUlf Hermann2015-08-2717-2/+1
| | | | | | | This way the plugin will successfully build with qbs again. Change-Id: Iac5fc64753bb225649ba9f62199d6248450e1546 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Remove extra clear() on loadData()Ulf Hermann2015-07-084-4/+0
| | | | | Change-Id: Ibe0bdc58efaccd28ffc4d4e923a085092ec722e5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Adapt to adding of main feature to QmlProfilerTimelineModelUlf Hermann2015-07-024-17/+10
| | | | | Change-Id: I54e2037106c8f0f5a0115cb415633acc8f0a879b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-07-013-5/+11
|\ | | | | | | Change-Id: I37bb3dcc54d49250a5d45d8dd35484dc3b5fa89f
| * qbs build: Soft dependency on LicenseChecker.qp-v3.5.1qp-v3.5.0-rc1qp-v3.5.0-beta1qp-v3.5.0qp-3.5Christian Kandeler2015-06-261-2/+1
| | | | | | | | | | Change-Id: I7323dfc9fa0db6625bfd1686240d812bfaec3aa2 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| * Make licensechecker dependency optionalKai Koehne2015-06-252-3/+10
| | | | | | | | | | Change-Id: Ibf66800bac5f674fb015f4aaf3923b824651e75b Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Remove dead codeUlf Hermann2015-06-301-3/+0
|/ | | | | Change-Id: If09d3829ff30bec9f3f789bdeef0175b126acb58 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Specify the source json.in in the .pro, not the compiled jsonUlf Hermann2015-02-261-1/+1
| | | | | Change-Id: If5e8da39ac05b30d80646d13a5dd1d4144805ba3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 10:33:55 +0000