summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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>
* Fix switched times for windows render loop.Ulf Hermann2014-07-021-2/+2
| | | | | | Task-number: QTBUG-39876 Change-Id: I01c15ede43a9d94fdfc3123b6df8a235430cfc81 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Group memory usage events by their cause and add location informationUlf Hermann2014-07-022-23/+91
| | | | | Change-Id: Id33fa51daffe97e9e60467942b92f0598a17c27d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Add scale to memory usage and pixmap cache modelsUlf Hermann2014-07-024-2/+21
| | | | | Change-Id: I69cb67a97b0bb3407f509db01ec2d4b9acd177db Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove redundant displayNamesUlf Hermann2014-07-023-7/+0
| | | | | | | | 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>
* Show scene graph events in correct thread for non-threaded render loopUlf Hermann2014-07-021-10/+26
| | | | | | | | | If no polishAndSync event is ever seen we can be sure the application is doing non-threaded rendering. In that case all other events belong to the GUI thread rather than the render thread. Change-Id: Ib5d0cbcdc7c45bff6303a1b4bfb1f5333830c7f7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Allow setting Qt Creator source and build dirs through qmake variablesEike Ziller2014-06-301-2/+2
| | | | | | | So they can be set through .qmake.conf in a subdirs project above it. Change-Id: I919e637fb7ed8a7f341982f0a9f06953e0131a2a Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* Adapt to centralization of type data.Ulf Hermann2014-06-183-11/+17
| | | | | Change-Id: Ie2ad2f7ab326adb88334b3bd686cbde0f25f1a83 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Derive from AbstractTimelineModel instead of SingleCategoryTimelineModelUlf Hermann2014-06-176-16/+16
| | | | | Change-Id: I720f067956417519e58fac9d92292edd7968356d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Memory usage modelUlf Hermann2014-06-174-2/+306
| | | | | | | | An additional model to represent memory usage of the application being profiled. Change-Id: I5f1e1e06a31adf2e4ba0bb63147492b6b5f50a3e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adapt to single category per modelUlf Hermann2014-06-164-12/+8
| | | | | Change-Id: I0af479f2405a9c71602b9635e8e8ec4b1bcb9554 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adapt to changes in event type definitionsUlf Hermann2014-06-162-5/+6
| | | | | Change-Id: If105f490a02ffabe07d2b4871c655972445c6a19 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/3.1'Kai Koehne2014-06-043-107/+286
|\
| * No need to qualify calls to SortedTimelineModel::clear()qp-v3.1.0qp-3.1Ulf Hermann2014-04-101-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-12010 Change-Id: I22bc4525329f50359e6857c595fe686af901711e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Remove some dead codeUlf Hermann2014-04-032-27/+7
| | | | | | | | | | | | | | Keeping redundant copies of the same data is wasteful and error prone. Change-Id: Ie4273d01728acd0caecf20739ae53376ef91ace8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Don't save minCacheSize and properly initialize maxCacheSizeUlf Hermann2014-04-031-9/+7
| | | | | | | | | | | | | | | | minCacheSize wasn't used anywhere and a maxCacheSize <= 0 is useless and may lead to wrong height values for cache events. Change-Id: Iee8c95197a7851bd41238e8e465bf6fd5b994573 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Fix pixmap cache profiling for multiple pixmaps with equal URLsUlf Hermann2014-04-032-56/+263
| | | | | | | | | | | | | | | | | | | | | | Apply a heuristic to figure out which pixmaps are causing which events. As the only means of identification we can get from the application is the URL this will never be perfect. However, using some knowledge about the inner workings of pixmap loading we can get usable results. Change-Id: I42d7af7499ed7692ed87e68e8fd12c7528e08b3e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Make the cache count row lie less.Ulf Hermann2014-03-241-11/+4
| | | | | | | | | | | | | | | | The height of the events there didn't correspond to the actual cache fill state. Change-Id: I8d0415d4ec4e9e97fb1821bb8c0f5b536e21abd4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Saturate colors some more and use color selection from base classUlf Hermann2014-03-113-4/+5
| | | | | | | | | | | | | | | | The original colors were hard to discern from the background on certain devices. Change-Id: I276f2cd76e0a1be40040bf5a0557a288d10d37d9 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| * Fix label for render thread.Ulf Hermann2014-03-101-1/+1
| | | | | | | | | | Change-Id: I8162d2dd025853055fff3d258e62eba5889ef3a8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove unused qml debug client implementationUlf Hermann2014-05-2632-4661/+0
|/ | | | | Change-Id: Iab39f4d172db265dd9654b16a8a01da71c3ed80c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adapt to unified data models in creatorqp-v3.1.0-beta1Ulf Hermann2014-02-194-8/+8
| | | | | Change-Id: I08991a79d5cc70bb374ecaa8d5b707962403cee7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Reduce code duplicationUlf Hermann2014-02-194-309/+64
| | | | | Change-Id: Icc072982427dc3874262fcaaf9885931e1588e80 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Use time formatting method of base class instead of reimplementing itUlf Hermann2014-02-182-26/+2
| | | | | Change-Id: I81da4ec2a7830f3a3ddfb85ceeffdaeca20c3c6d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Eliminate redundant isEmpty() methods.Ulf Hermann2014-02-184-14/+0
| | | | | Change-Id: I7cdde38a389e077875199a0b34c8b527691aa96e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Eliminate redundant name() methodsUlf Hermann2014-02-184-14/+4
| | | | | Change-Id: Icaa03eee0650481309e073c51b1a5a1b98820b41 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Eliminate redundant categories() method in favor of categoryCount()Ulf Hermann2014-02-184-12/+0
| | | | | Change-Id: Iaab6c1bc30208abe018a1534c2197166f673cf81 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Unify handling of category labelsUlf Hermann2014-02-184-16/+0
| | | | | Change-Id: I3d06035e066aa249f5dcc06aa787c3480bbde74b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/3.0'Kai Koehne2014-02-123-3/+19
|\ | | | | | | Change-Id: I3ecb199025eb536045ec23e3afc3fe903e2dae63
| * Disable functionality for invalid licensesqp-3.0Kai Koehne2014-01-242-3/+16
| | | | | | | | | | | | Change-Id: I2366784444e458bec30120809b151bfccd8b182f Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Send expandedChanged if expanded state changes.Ulf Hermann2013-12-021-0/+3
| | | | | | | | | | | | | | | | If this is not done the timeline isn't immediately redrawn when the category is expanded, which leads to stale data being shown. Change-Id: If8da6dbe5c8124105e1e15fb5129df906114723f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Update cache size when pixmap size becomes knownUlf Hermann2013-12-121-4/+13
| | | | | | | | | | | | | | | | | | | | | | The QML engine can reserve space in the pixmap cache (a QHash of pointers) significantly before the pixmap is actually loaded. We can only be sure about the actual size of the loaded image after it has been loaded, though. This means we have to show pixmap cache updates in two stages. One for "space reserved" and for "pixmap actually cached" Change-Id: Ic7a7cd522e74d8b9b42dfbd6a9a0c4e9ffd6a401 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Use SortedTimelineModel for pixmap cache eventsUlf Hermann2013-12-122-101/+50
| | | | | | | | | | | | Change-Id: Ib84da3bd94d37a228f0a4bdd649a358ad0d3c4b4 Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Use dataChanged() implementation from abstract timeline modelUlf Hermann2013-12-124-49/+0
| | | | | | | | | | | | | | No need to repeat the same code multiple times. Change-Id: Ibe6865458c7ae47cc32f03cdc493ada320def584 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Use SortedTimelineModel for scenegraph timeline modelUlf Hermann2013-12-122-103/+41
| | | | | | | | | | Change-Id: I85e48c6301ad670105345621d9a1fb66baa39eb5 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Make sure that all pixmap URLs have a some event in the timelineUlf Hermann2013-12-121-15/+19
| | | | | | | | | | | | | | | | | | If that's not the case the categoryDepth() method will return a lower number of categories than getLabelsForCategory() which leads to glitches. Change-Id: I2cf4c70586af2922f061a57c5a9f4b6bd0f77903 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Revert "Make sure that all pixmap URLs have a some event in the timeline"Ulf Hermann2013-12-062-35/+22
| | | | | | | | | | This reverts commit 727f9436718002cf9bd3cdf651e5b174f34cedd3. It was accidentally pushed without review and is broken, too.
* | Make sure that all pixmap URLs have a some event in the timelineUlf Hermann2013-12-022-22/+35
|/ | | | | | If that's not the case the categoryDepth() method will return a lower number of categories than getLabelsForCategory() which leads to glitches.
* QmlProfilerExtension: using QtCreator's qmlprofiler pluginChristiaan Janssen2013-08-12104-18623/+8
| | | | | Change-Id: I3daca67692a1b9c390bbd396fdd2991ae3c50297 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/2.8'Christiaan Janssen2013-08-081-5/+19
|\ | | | | | | Change-Id: I5ac289ba3e8291da88849ba996b138fbaea2c1a5
| * QmlProfiler: fix issues with SceneGraphModelProxyqp-2.8Christiaan Janssen2013-08-081-5/+19
| | | | | | | | | | Change-Id: I1d58b158b7afb805ea03f439ec12b37acc8925c7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QmlProfiler: unify client to simplemodel event callsChristiaan Janssen2013-08-0810-140/+58
| | | | | | | | | | Change-Id: I1c3c1abbfd06c21498a0eb8f7c472d5f93f853cc Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QmlProfiler: merge back changes in creator/masterChristiaan Janssen2013-08-089-229/+132
| | | | | | | | | | Change-Id: Ib9a13c1feb08defa1b8cf1fc308837d71c858fae Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge branch '2.8'Christiaan Janssen2013-08-0635-112/+501
|\ \ | |/ | | | | Change-Id: I72da0b7942c0c98639e8d2f5397f2d95caf7f612
View Lorry Controller Status