aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldebug/qqmlprofilerclient.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qml Tooling: Correctly sort debug messages into tracesUlf Hermann2018-11-151-5/+11
| | | | | | | | | | | Debug messages are sent from a different debug service and generally arrive before they are "due". Therefore we buffer them and pass them on when the trace has advanced to their position. However, we forgot some places where we needed to check if there are pending debug messages to be sent. Change-Id: Ia6263086a9d06ae7c77c9e2afa85e6e1d8c8a19b Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-261-1/+0
|\ | | | | | | | | | | | | | | Conflicts: src/imports/imports.pro src/src.pro Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744
| * Make QtQmlDebug independent of QtQmlUlf Hermann2018-04-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means QtQmlDebug needs its own qqmlprofilerdefintions.h. This is a good thing because this way we notice if we change the definitions in an incompatible way. The test uses QtQmlDebug after all. Also, qqmldebugserviceinterfaces_p.h is not available anymore, which means the service names have to be spelled out. This, also, is beneficial as it prevents us from accidentally changing the names. In the context of QmlDebug we don't need to namespace the profiler definitions, either. This simplifies some code. Task-number: QTBUG-60996 Change-Id: Ibb39e48c9b758687d68b8ce4431f45eb26939a09 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQmlDebugClient: Make stateChanged a signalUlf Hermann2018-03-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | This way we can observe it from the outside and drop all the code that genrated extra signals from the virtual method. Also drop the unused QQmlDebugTestService::stateHasChanged signal to reduce the confusion. Change-Id: Ia37c1eaf8b392e594b0931694f43f84fe09b000c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-081-4/+24
|\| | | | | | | Change-Id: I32ae7587ddd92c53d078dc5bb69ca9281f801612
| * QmlDebug: Clear profiler client's trackedEngines on clear()Ulf Hermann2018-02-081-0/+1
| | | | | | | | | | Change-Id: Ibd3e033339e26158c5f5c3dadbbcb6a903671cf5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * QmlDebug: Use EngineControl to hold engines until we're done with themUlf Hermann2018-02-081-4/+23
| | | | | | | | | | | | | | | | | | Holding the engines with EngineControl makes sure we always receive the full trace before the connection drops. Task-number: QTBUG-66269 Change-Id: I9177c2a52743ba781547696508342c8d98557121 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Define ~QQmlProfilerClient out of lineUlf Hermann2018-02-071-0/+4
|/ | | | | | | | This is a virtual function. We want only one definition of it. This also fixes some linker warnings to the same effect. Change-Id: Idffea96e705470be5d79bfd075fb62c0d52eac00 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use better QmlProfiler client from Qt CreatorUlf Hermann2018-02-021-265/+224
| | | | | | | | | | | | This client can track locations itself, and thus doesn't require the server to send the event types over and over with each message. Once all our client implementations have this feature we can drop a lot of code. Furthermore, this way we can write regression tests for bugs that only occur when client side location tracking is active. Change-Id: I3735392452e20a7be98e92b900fadef04701d85f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Run includemocs in qtdeclarativeThiago Macieira2017-04-261-0/+2
| | | | | Change-Id: I84e363d735b443cb9beefffd14b8c023a37aa489 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QmlProfiler: Send RangeData and RangeLocation only once per typeUlf Hermann2016-05-271-2/+19
| | | | | | | This saves time when serializing the data to be sent. Change-Id: Ic8c534d55445934a64dd253273099194b27d98af Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Updated license headersJani Heikkinen2016-01-191-14/+20
| | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QmlDebug: Make profiler client use the right service keyUlf Hermann2015-11-171-1/+2
| | | | | | | This is the upside of having the keys exported after all. Change-Id: I265f481668e72d3c3bde1400b7f1e2b61eea82af Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* QmlDebug: Restructure QPacket and QPacketProtocolUlf Hermann2015-11-171-8/+5
| | | | | | | | | | | | | | | | | | | | | | We cannot use the same data stream version for the client and server versions of QPacket and QPacketProtocol should not deal with QPackets but with simple byte arrays because the underlying QDataStream is hard to copy. The new QQmlDebugPacket picks its data stream version from QQmlDebugConnector now, which adjusts it when connecting. As there can only ever be one QQmlDebugConnector, we can keep the version static. The clients need to query the connection for the correct version. We may connect to several different servers sequentially or we may have a server running while using a client, and we don't want to confuse the versions between those. With this in place, all remaining occurrences of QDataStream are replaced with QPacket or QQmlDebugPacket. Change-Id: I3f6ba73fcbfad5e8df917c5feb9308116738a614 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Move QML profiler client to qmldebugUlf Hermann2015-10-301-0/+356
Change-Id: I506909b68be6cbad631d1645673c2d38460aed33 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>