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
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
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
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
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
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
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
Kai Koehne
30035cea42
Disable functionality for invalid licenses
...
Change-Id: I2366784444e458bec30120809b151bfccd8b182f
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-01-24 15:56:45 +02:00
Kai Koehne
67d66abf8f
Rename QmlProfilerExtended to QmlProfilerExtension
...
Change-Id: I90325b264e2a41e9b52d7953c6e96e13c938705a
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-06-25 16:07:39 +03:00
