aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlprofiler
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-261-0/+2
|\ | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qml.pro tools/qmlprofiler/qmlprofilerclient.cpp Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
| * qmlprofiler: Use server's datastream version for communicationUlf Hermann2015-10-151-0/+2
| | | | | | | | | | | | | | | | As qmlprofiler doesn't support datastream version negotiation we have to use the data stream version the server uses by default: QT_4_7. Change-Id: I0fa89f82f0f6c651e8e377bd578f8d7ae61045ab Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Tools: Fix single-character string literals.Friedemann Kleint2015-10-132-3/+3
| | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I55679dcc13c4c79567712c0dfaaabc2b84fee010 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Ulf Hermann2015-08-182-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qv4debugservice.cpp src/qml/jsruntime/qv4value_inl_p.h src/qml/jsruntime/qv4value_p.h src/qml/memory/qv4mm.cpp src/qml/memory/qv4mm_p.h src/qml/qml/qqmlnotifier_p.h src/qml/qml/qqmlproperty.cpp src/quick/items/qquickflickable.cpp src/quick/items/qquicktextedit.cpp tests/auto/quick/qquickwindow/BLACKLIST The extra changes in qqmlbinding.cpp are ported from changes to qqmlproperty.cpp that occurred in parallel with writeBinding() being moved to qqmlbinding.cpp. Change-Id: I16d1920abf448c29a01822256f52153651a56356
| * qmlprofiler: Add missing #include <limits>.Friedemann Kleint2015-07-282-0/+4
| | | | | | | | | | | | | | Fixes the build with VS 2008 (Desktop). Change-Id: I8c9682526754586ea6f597f540a4d5b42363f052 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Allow specification of loadable debug services via command lineUlf Hermann2015-08-131-1/+2
| | | | | | | | | | | | | | | | | | We don't want to load the debugger when profiling and vice versa. This makes it easier to prevent unwanted services from getting loaded. Task-number: QTBUG-47623 Change-Id: I28893b6218110274a6d30b27805d89dbb443add3 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | qmlprofiler: Use QQmlProfilerDefinitions for accessing definitionsUlf Hermann2015-07-235-131/+144
| | | | | | | | | | Change-Id: I6def7dd8a0ce0db22ad4829029d8510f5869c813 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Fix inefficient usages of qDeleteAll()Sérgio Martins2015-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | No reason to iterate through all items to create a temporary QList we don't need. Change-Id: I3c5388f026ded0290afb9dd35fc7934011c4998d Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | qmlprofiler: Remove some dead codeUlf Hermann2015-06-152-7/+1
| | | | | | | | | | Change-Id: If1f542bc73d5af259ea3c0a5da40786f8d6f3dbf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Allow specification of features to recordUlf Hermann2015-06-094-2/+120
| | | | | | | | | | | | Task-number: QTBUG-43066 Change-Id: I963a5a483f961dd150f00de3d96c723c8b62edb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Record input eventsUlf Hermann2015-06-095-6/+43
| | | | | | | | | | Change-Id: Ib6413d97638b192377d7dbeb19ed0c2f733a06a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Output data after application quits in non-interactive modeUlf Hermann2015-06-073-1/+12
| | | | | | | | | | Change-Id: I38abed0d5af3bcc7be5fa9e21bde14be40a3ce1d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Redirect app stdout to qmlprofiler stderrUlf Hermann2015-06-071-1/+1
| | | | | | | | | | | | | | | | This seems to be a common technique for tools that wrap application execution and potentially have their own output. Change-Id: I4ca1bc5861d5b915b4ca07aec08ad06c8c73c8d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Improve options for trace outputUlf Hermann2015-06-064-50/+211
| | | | | | | | | | | | | | | | | | | | | | | | * Remove the auto-generation of file names. * Accept file names as parameters or from interactive commands * Output to stdout by default for better scripting and quick preview * Decouple output from clearing of data so that you can write the same data multiple times. Task-number: QTBUG-43066 Change-Id: Ia4cc3701cbac7c6f8948b11307130a5d6a2ff44c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Only accept commands if we ask for themUlf Hermann2015-06-066-41/+20
| | | | | | | | | | | | | | | | This way we can shut down the input thread after the last command and we cannot get commands before we can process them. Change-Id: Ie1583a338da9c9df0e07c9e09ce185857c5ea66d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Allow aggregation of multiple traces into one file.Ulf Hermann2015-05-211-4/+6
| | | | | | | | | | Change-Id: Ifc9f9adafa3178e68212fb97914a6f4cae9a4c83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: In interactive mode, don't quit if application quitsUlf Hermann2015-05-211-7/+7
| | | | | | | | | | | | | | We might want to inspect or save the pending data in some special way. Change-Id: I235b1f948ad4a9ddd100332991243231119bcf08 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Remove useless 'maximumTime' member.Ulf Hermann2015-05-211-11/+0
| | | | | | | | | | Change-Id: Icdb35e0763694312cfb4166df0f537e1845116e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Add non-interactive mode and make it the default.Ulf Hermann2015-05-213-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | If you just run a test application through the profiler without any further parameters, you want it to record the data the application generates and then terminate itself. [ChangeLog][QtQml][Behavior Change] Make qmlprofiler command line interface better suited for scripting. Task-number: QTBUG-43066 Change-Id: I831e714b9c7b4b984b6450ad5c78ba4fdae6b8f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Clean up recording state messUlf Hermann2015-05-214-96/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | The recording state is a global property of the profiler client, it has to match the application's recording status as well as possible, and the user can set an initial target value with a command line parameter. This way we don't get strange error messages when the application quits by itself and properly sends all the data before. Task-number: QTBUG-43066 Change-Id: Id93aa7fb940f870c8f16cea8427c38aab450f864 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmlprofiler: Add some sanity to command line parsing.Ulf Hermann2015-05-213-85/+87
|/ | | | | | | | | Use QCommandLineParser to allow for double-dash options and improve the help text. Task-number: QTBUG-43066 Change-Id: Iac772cbbf750016a9058658c9b4b275faf8fb62f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-161-14/+2
|\ | | | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
| * Use qt_subtract_from_timeout instead of duplicating qt_timeout_valueDaniel Teske2015-04-141-14/+2
| | | | | | | | | | | | | | | | The same function was duplicated 5 times in qtbase, so create one copy to rule them all and use it also in QtDeclarative. Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1215-105/+105
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Update license headers and add new licensesJani Heikkinen2014-08-2515-285/+165
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Write memory events into tracefiles generated by qmlprofilerUlf Hermann2014-08-125-0/+35
| | | | | Change-Id: Ic01505194f29967ed1aad16fe36e14dc5532ae25 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Javascript heap profilerUlf Hermann2014-06-061-1/+2
| | | | | | | | | This profiler tracks every memory allocation and deallocation, by the MemoryManager as well as the V4 VM, and exposes them as a stream of events to the profiler service. Change-Id: I85297d498f0a7eb55df5d7829c4b7307de980519 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Properly support all events in trace files and clean up a bit.Ulf Hermann2014-06-065-69/+236
| | | | | | | | | In particular, use both message and range type to identify events so that we can get rid of the messy type aliasing. Task-number: QTBUG-36953 Change-Id: I691a7501aa285f78f7ce5b7017ef50628f44fcf7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Save painting events in Qt5 style with thread ID from qmlprofilerUlf Hermann2014-03-185-22/+24
| | | | | | | | This is necessary to support https://codereview.qt-project.org/80391 and to make the trace files consistent with Qt Creator's. Change-Id: I45490c33ae9bd8fbbb6bace08bdc2f44c76bf966 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* fix whitespaceOswald Buddenhagen2014-01-222-2/+2
| | | | | | | remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* suppress qml import scan for the tools which don't need itOswald Buddenhagen2013-10-211-0/+1
| | | | | Change-Id: Iefdaf60edbe47d2941a0696d96e7b79a67b46d8d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-131-0/+1
|\ | | | | | | Change-Id: I6fc67bf30a901f8078a5b99a9e290190b3f64b81
| * Fix a warning about not using a set variableLaszlo Papp2013-09-051-0/+1
| | | | | | | | | | | | | | | | | | 6a36bcb7945109daebd6464ee6d0a3f6724fb18b fixed similar warnings, but apparently the tools folder was left out. Change-Id: If7f889e404264688fa6208afcd3bfdba5a161714 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Remove qSort usages from declarativeGiuseppe D'Angelo2013-09-131-2/+4
| | | | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-06-242-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wip/v4 Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
| * Make qtdeclarative compile with QT_NO_NETWORKPROXYTasuku Suzuki2013-06-111-0/+2
| | | | | | | | | | Change-Id: Ie7bf1e1d15da323f901f2c6b851a7b1e8ae0d832 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Make qtdeclarative compile with -no-guiTasuku Suzuki2013-06-101-1/+1
| | | | | | | | | | Change-Id: I0c5a55c8f6b78450b2bce693bb55e12f8a224172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-151-1/+1
|/ | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1015-15/+15
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-011-2/+0
| | | | | Change-Id: Ia07dc830586fd30f4ee98c64e9f2accae5cf2f06 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2315-363/+363
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* "export" the qml tools for qtPrepareTool() useOswald Buddenhagen2012-07-111-9/+2
| | | | | | | | | | notably, this disables the build of qmlplugindumpd.exe under windows - it is not clear to me why somebody would want to do that, as both sets of libraries would be available, and the output from both variants should be the same. Change-Id: I95c77b2aa32f17f9d6df0e5d4b9d11f456d860f6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QmlProfiler: storing binding typeChristiaan Janssen2012-05-045-10/+32
| | | | | Change-Id: If1f02e1e6f6ce6aba9874a63d01a08d57571f991 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Use minimal javascript expression for bound signalsChris Adams2012-03-291-1/+1
| | | | | | | | | | | Previously, QQmlBoundSignal used QQmlExpression internally. This commit adds a new, more optimal QQmlJavaScriptExpression subclass specifically designed for QQmlBoundSignal, and converts the code to use it instead of QQmlExpression where appropriate. Task-number: QTBUG-24460 Change-Id: I2865a119ce840235e27a7722d8052ca61c265f69 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Debugger: Disable debugging for qmlprofiler, qmltestKai Koehne2012-03-201-1/+1
| | | | | | | | | QmlProfiler uses the debugging API as a client, but doesn't have to be debugged itself. I don't think there's a use case to debug qmltest either. Change-Id: Ibc8849c77d807f96c6abec5cebc3581ab023d5ae Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* QmlDebuggingTests: Separate out public and private testsAurindam Jana2012-03-194-4/+668
| | | | | | | | | Remove dependencies on quick-private from all possible debugging auto tests and list them under public tests. Change-Id: I688b5b36fdf3d6fbcb6cef2a975ecd1bf679af2b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlProfiler: updated standalone appChristiaan Janssen2012-03-1311-2224/+834
| | | | | | | Using a stripped-down version of the profiler data structure. Change-Id: I93a0b12462edea0ca8a1d0db42aa892aa2afc919 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Remove QQmlDebugClientAurindam Jana2012-03-094-4/+525
| | | | | | | | Remove QQmlDebugClient and relevant classes from the library and move to client code. Change-Id: I6f526b3f0c92970dcad5e5abd8585bb9b406349e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-056-153/+153
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
* | Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2410-78/+78
|/ | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>