aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling/shared
Commit message (Collapse)AuthorAgeFilesLines
* Tooling: Convert connects to Qt5 styleUlf Hermann2016-07-281-1/+1
| | | | | Change-Id: I6746b777f73d047f5cf610bfca9b320ac1e13676 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Eradicate Q_FOREACH loops from headersMarc Mutz2016-05-111-1/+1
| | | | | | | | They may prevent use of QT_NO_FOREACH in other Qt modules. Change-Id: Iafc04a73579a90492f3ff303978b78b71eec4e55 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Updated license headersJani Heikkinen2016-01-194-56/+80
| | | | | | | | | | | 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>
* Use QJSEngine instead of QQmlEngine in debug servicesUlf Hermann2015-11-171-4/+4
| | | | | | | | | This allows us to use the debug infrastructure in a JavaScript-only environment. Also add override declarations to make such changes easier in the future. Change-Id: I171271f0ad3868b3de71a8a2316a24602f94200a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QmlDebug: Restructure QPacket and QPacketProtocolUlf Hermann2015-11-172-0/+66
| | | | | | | | | | | | | | | | | | | | | | 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>
* Put QPacketProtocol into its own static libraryUlf Hermann2015-10-152-642/+0
| | | | | | | | | | | | We need it in 3 places in qtdeclarative and we could also use it in QtCreator. We don't want to bundle it with the debug client code as it is also necessary for the server. QPacket replaces QQmlDebugStream as it has the same purpose. This also fixes the inconsitent handling of data stream versions. Change-Id: I650fae353f267511c551b427d9169f4d718aa7f2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Move QQmlConfigurableDebugService into qmltooling/sharedUlf Hermann2015-08-041-0/+106
| | | | | | | It's only used by plugins now. Change-Id: Ia73a2a22ba6bccbd85bbca6eda2fb9f5a8d6dd3b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Move inspector service and QtQuick2 inspector into a common pluginUlf Hermann2015-08-044-681/+0
| | | | | | | | | The inspector service doesn't do anything useful without the QtQuick2 plugin and vice versa. This way we can also use the QQmlDebugPluginManager. Change-Id: I78f154dcc9103ec9ec3d2eda216bfb293231583e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Remove pimpl from debug server connectionsUlf Hermann2015-08-041-3/+4
| | | | | | | | Now that they are self-contained plugins there is no reason for the indirection anymore. Change-Id: Ic2e2fe2075796c758057235e12981c8d40ce97c2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Use QQmlDebugPluginManager for loading connection pluginsUlf Hermann2015-08-041-2/+8
| | | | | | | | Also remove all the hacks that deal with static builds, QT_NO_LIBRARY and friends. QQmlDebugPluginManager handles those cases. Change-Id: I62f13b787292108fa25d09fabc775332394989be Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Deduplicate debug server connection code.Ulf Hermann2015-08-042-4/+2
| | | | | | | | | | | | | The packet protocol can be part of the server, now that the server is not part of QtQml anymore. This enables us to remove some duplicated code from the connections. As an added benefit, with more control over the sending process, QQmlDebugServer can now efficiently send single packets, without creating a QList<QByteArray> first. Change-Id: I13cc831e254c02b737e64816d6d3ab051d760995 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Move QQmlDebugServer into a pluginUlf Hermann2015-08-042-0/+139
| | | | | Change-Id: I8dc95f64c6df7303e8f580f191ee35da2284718b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Retrieve services from debug connector, not via static instance()Ulf Hermann2015-08-041-2/+2
| | | | | | | | | This will allow us to remove the instance() methods and create the services from factories in plugins. Also, it allows us to remove the isDebugging member from QQmlEnginePrivate. Change-Id: Id9d9820a910902ecfdb1e8175e215093ce3d0965 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Extract minimal abstract interfaces from debug services.Ulf Hermann2015-08-042-3/+3
| | | | | | | | We will access the services' functionality through those interfaces once they live in their own plugins. Change-Id: I0a0d7e73c07cb874b3b507cc4a9d304588c87bca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix namespaces in inspector pluginUlf Hermann2015-08-044-3/+12
| | | | | | | | | Defining things outside the Qt namespace and then accessing Qt internals is just asking for trouble. The redundant QtQuick2 namespace can be dropped, though. Change-Id: Ifa83733a3f98704b7b51697dbca9486d0f504f65 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Use signal/slot for passing messages through QQmlDebugServerUlf Hermann2015-07-311-4/+4
| | | | | | | | | | | | | | This results in much cleaner code than the previous implementation using QMetaObject::invokeMethod(). We have to use read locks now for adding and removing engines, as we should have done already before. If a condition is waiting on a write lock you cannot acquire a read lock from another thread. So, if we kept the write locks we wouldn't be able to receive messages while the engines are waiting. Change-Id: Icfe641601dec2f8d7181ae579146ed603d57a4c2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Remove qqmlinspectorconstants.hUlf Hermann2015-07-292-68/+0
| | | | | | | | Only two of the constants were used and both only once in the same file. We can as well declare them there. Change-Id: Idda68707a209af2c84fc06e22516e64fceb5f4bc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Simplify object/id lookup in QQmlDebugServiceUlf Hermann2015-07-211-1/+0
| | | | | | | | | | By tracking object destruction we can avoid looping over all cached objects to find out which ones are still OK and we don't have to manually clear the cache anymore. Looking up objects by source location is specific to the engine debug service and should be done there. Change-Id: I7dab73a7bf9c17087784f1bd9c5aef513b31e2c1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add 28 QList::reserve() callsSérgio Martins2015-06-081-0/+1
| | | | | Change-Id: Id4820ac458f48b10f2bf457144767efdef9e2c07 Reviewed-by: Marc Mutz <marc.mutz@kdab.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-127-49/+49
|/ | | | | | | | | 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-257-133/+77
| | | | | | | | | - 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>
* fix whitespaceOswald Buddenhagen2014-01-221-1/+1
| | | | | | | remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-107-7/+7
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix other warnings in qtdeclarative found by GCC 4.7Thiago Macieira2012-12-231-0/+1
| | | | | | | | | | | | | qml/qml/qqmlimport.cpp:982:30: error: unused parameter 'errors' [-Werror=unused-parameter] quick/util/qquickanimationcontroller.cpp:66:6: error: unused parameter 'job' [-Werror=unused-parameter]' quick/items/qquickshadereffectnode.cpp:160:17: error: case value '38' not in enumerated type 'QVariant::Type' [-Werror=switch] quick/items/qquickwindowmanager.cpp:286:60: error: 'renderTime' may be used uninitialized in this function [-Werror=maybe-uninitialized] quick/items/qquickitem.cpp:5267:67: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] and a few more repeated from the above Change-Id: Id1950c6ba98f7f8475975716b21bd795ecb4bd20 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Compile with QT_NO_WHEELEVENT.Volker Krause2012-12-193-0/+8
| | | | | | | | Change-Id: I2fbe6f45ba50e3db75bd02cfca47ddabfcd5fc49 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-237-169/+169
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Changes for "App on Top"Simjees Abraham2012-06-052-13/+1
| | | | | | | | | Changes made such that the App is on Top at startup if the option was set in creator. Task-number: QTCREATORBUG-6295 Change-Id: I218a619805d9091049ba51ac6da2f64049d5185d Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Modified response for "destroyObject" message.Simjees Abraham2012-05-292-7/+8
| | | | | | | | The response for "destroyObject" carries the debugId of the destroyed object. Change-Id: I9be56f8db42ff2e83544ebbd058a6a8d48b4c98f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger : Handling destruction of multiple elements.Simjees Abraham2012-05-242-10/+12
| | | | | | | | | Changes made to handle the case where multiple elements are removed in the editor and saved when "Apply on Save" is active. The respsonse is sent with the correct Id. Change-Id: I76dc1487a0a5ebf859d2ef54cc64a4a5fc4008ca Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Response for DESTROY_OBJECT request sent correctlySimjees Abraham2012-05-212-2/+25
| | | | | | | | | The response for request DESTROY_OBJECT is sent after the object has been destroyed. This enables the creator to sync the objects tree displayed for debugging. Change-Id: Icedaf92df4402f067fd5b8590811c770e4b9063e Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Inspector:Modified Apply changes on Save for unsync. changesSimjees Abraham2012-05-142-2/+30
| | | | | | | | | | Changes done to reload the view if the user opts to do so after making unsynchronizable changes. Inspector informs the QmlEngine about the changes which caches it. The cache is used to load the files which were changed when reloading the view. Change-Id: I22d476cace294d6ecf4e428dac104a557c3f7dde Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QmlDebugging: Exchange supported QDataStream versionsAurindam Jana2012-04-261-3/+3
| | | | | | | | | Since the client and service needs to pack/unpack datastreams, they need to encode/decode using the lowest common QDataStream version. Change-Id: I3b4886fece59b24950ba618da07a0fefd41a5637 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Change name and protocol of QDeclarativeObserverModeAurindam Jana2012-04-253-412/+147
| | | | | | | | | Rename QDeclarativeObserverMode to QmlInspector service. This is because the current protocol has been changed completely and just a version change is misleading. Change-Id: I3b72f081f6ab77eac474dcef7a84375ef69e20dc Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlInspectorPlugin: AbstractViewInspectorAurindam Jana2012-04-243-16/+0
| | | | | | | | Remove unneeded members. Change-Id: I62334561ca53264124dbbc73d679d9b631c8a32d Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Display selected item name in inspectorSimjees Abraham2012-04-191-2/+8
| | | | | | | | | Changes made to Inspect Tool such that the selected item's name is displayed during selection and then on click of the selected item. The name is displayed for 1.5 seconds. Change-Id: Id71c82775c2d55eeda969b8a998e130d2f5ff29d Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Enable/Disable toolAurindam Jana2012-04-102-0/+3
| | | | | | Change-Id: Icb200474f1edff62d2fdd4bad9389117966775d5 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Remove Color ToolAurindam Jana2012-04-104-30/+1
| | | | | Change-Id: I3d54d24c2873648c9530ee8e7a33c95275e369e0 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Highlight select itemsAurindam Jana2012-04-101-2/+2
| | | | | | | Enable higlight of selected items only in Design Mode. Change-Id: I06e97df51bf8632560932dda776e748df90bc163 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Inspect ToolAurindam Jana2012-04-101-0/+2
| | | | | | | | | Select item on single click/tap and cycle through elements in the view stack on double click/tap. Change-Id: I36cdcbf3a8800a715eda6c916f4f206bac16e399 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Combine Selection and Zoom ToolsAurindam Jana2012-04-104-20/+6
| | | | | | | Combine the Selection and Zoom Tools into Inspect Tool. Change-Id: I2477e2b27f5dde5d74489ecf3c43a049e2ed3aa3 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Initial checkin for ZoomTool implementationSimjees Abraham2012-03-263-0/+19
| | | | | Change-Id: I0f2c8906a48b0c1d45fb980a349a8ffb135130b5 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebuggingTests: Separate out public and private testsAurindam Jana2012-03-192-0/+669
| | | | | | | | | 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>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-246-30/+30
| | | | | | | | | | | | | 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>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-306-6/+6
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-236-6/+6
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-056-6/+6
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Debugger: Split inspector plugin into a qtquick1 and a qtquick2 pluginKai Koehne2011-11-016-0/+1024
This allows the inspector to be used also when e.g. qtquick1 and widgets libraries are not available. Change-Id: Id8510ea2a1a9c2a776d67e6d7732a4e40363d5a3 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 17:10:56 +0000