aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove qqmlinspectorconstants.hUlf Hermann2015-07-294-71/+5
| | | | | | | | 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>
* Clean up project files for debug connectionsUlf Hermann2015-07-294-31/+21
| | | | | | | | Don't specify files that don't exist and remove the pri/pro distinction. The .pri files aren't included from anywhere else. Change-Id: I7d77e3db495d8256adbface20657d7632e0e5a10 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Simplify object/id lookup in QQmlDebugServiceUlf Hermann2015-07-212-3/+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 option to use a local socket for QML debuggingUlf Hermann2015-06-267-1/+297
| | | | | | | | | | Using a TCP debug server comes with a number of drawbacks. It has a larger overhead than other connection types, the application has to be able to access the network and there has to be an open port we can find somehow. Change-Id: Ia7fb24006b89419988c6504797303d84c3aa1bbc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add 28 QList::reserve() callsSérgio Martins2015-06-082-0/+2
| | | | | Change-Id: Id4820ac458f48b10f2bf457144767efdef9e2c07 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-162-15/+3
|\ | | | | | | | | | | | | | | 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-142-15/+3
| | | | | | | | | | | | | | | | 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>
* | Fix invocations of static methods of QGuiApplication/QCoreApplication.Friedemann Kleint2015-03-051-3/+3
| | | | | | | | | | Change-Id: I7bcc209b0c6e77cf6d974af85a19487345a48975 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1217-119/+119
| | | | | | | | | | | | | | | | | | 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>
* | QmlDebug: Provide public method for starting a debug serverUlf Hermann2014-12-052-7/+14
|/ | | | | | | | | With QQmlDebuggingEnabler::startTcpDebugServer you can create a debug server for debugging or profiling also without the qmljsdebugger command line argument. Change-Id: I642f73680585f9c7578762bcc0b247c736fe1338 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Stop waiting in QTcpServerConnection if waitForBytesWritten failsUlf Hermann2014-10-241-2/+7
| | | | | | | | | | | | There is no point in waiting any further for the remaining bytes to be written as it will never succeed. We might get luckier by creating a local event loop and repeatedly calling processEvents(), but as that is considerably worse style and because you shouldn't rely on the connection to send on exit anyway we don't do that. Task-number: QTBUG-42158, see also QTBUG-24451 Change-Id: I79ffd5f5a4a7c41ff8dc0c4f6f1ca7e091844c9d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-2517-323/+187
| | | | | | | | | - 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>
* qmldebugger: handle static builds correctlyFawzi Mohamed2014-03-113-13/+17
| | | | | | | | | | | | The loading of the qml debugger was hardcoded to dynamically load its plugins. Now directly build and instantiate the QQmlDebugServerConnection in static builds. Done-with: Kai Koehne <kai.koehne@digia.com> Change-Id: I38bf0e310caaa6aaa743e3814b0108c6fe7001df Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@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>
* Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-152-2/+2
| | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Debugger: Accepts port range as argumentsAurindam Jana2013-04-022-9/+23
| | | | | | | | | | Allow a port range to pass on command line, and try to listen on any of the ports in the range. (Re)using the ',' separator allows for backwards compatibility, that is, also Qt 4 will accept a -qmljsdebugger=port:1000,1010 argument, but will only try to listen on port 1000. Change-Id: Ic03fe20e4aee9ecdea86651f46f1df5cb19bd75c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Debugger: Remove symbian specific pluginKai Koehne2013-01-306-735/+0
| | | | | | | Symbian isn't supported any more. We only support debugging via TCP. Change-Id: Ie7be06eeacd4206c4c14178e24c1b33d35fc8a0c Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1022-22/+22
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
| | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@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-195-0/+12
| | | | | | | | 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>
* Add PLUGIN_CLASS_NAME to qtdeclarative pluginsMiikka Heikkinen2012-12-113-0/+3
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: I558a0f83c69179d3838c64fee069cc0e9c1d67cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Renamed QQuickItem::pos property to positionShawn Rutledge2012-11-292-10/+10
| | | | | | | | | Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* make module compile with -no-guiTasuku Suzuki2012-11-222-2/+2
| | | | | Change-Id: I106cf0933930115464b0b7507177e6129098d22b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-081-2/+2
| | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* adjust to qt_plugin.prf changes, part 2Oswald Buddenhagen2012-11-013-15/+0
| | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I2dab25a2527d376eaa37f233782ffe4b6a58b8f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to qt_plugin.prf changes, part 1Oswald Buddenhagen2012-10-293-0/+3
| | | | | | | | PLUGIN_TYPE will need to be defined. do this before the respective change in qtbase, due to the reverse dependency. Change-Id: I97e7574b48512958689dab0c0697f2edc8666807 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove interim compatibility measuresAlan Alpert2012-10-164-44/+44
| | | | | | | | Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2322-529/+529
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-112-4/+0
| | | | | Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Empty JSON files are not needed for the plugin systemAlan Alpert2012-07-254-5/+2
| | | | | Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QQuickCanvas renamesAlan Alpert2012-07-171-3/+3
| | | | | | | | | | | | | | | | QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* remove stale references to QTDIR_buildOswald Buddenhagen2012-06-292-3/+1
| | | | | | | | | | | after the buildsystem changes, qtbase's .qmake.cache is not longer included by other modules, thus the QTDIR_build condition will now never trigger, causing various breakages. and as nowadays modules can be build as part of qt or standalone without any changes, the conditon makes no sense to start with. Change-Id: I4a2ed6153577b6d064ab0dc407ce99f31b1263ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-262-2/+2
| | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* don't reference $$QT_BUILD_TREE - it's unavailable hereOswald Buddenhagen2012-06-261-1/+1
| | | | | | Change-Id: Iafef42747b07c900ae22f202c7dfc5c49a1b0f67 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Changes for "App on Top"Simjees Abraham2012-06-054-13/+24
| | | | | | | | | 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: Clearing the ObjectReferenceHashSimjees Abraham2012-05-301-0/+3
| | | | | | | ObjectReferenceHash is cleared when the Qml file is reloaded. Change-Id: I78da1d88cce2f04fe820f3af14b047cd562e90ed Reviewed-by: Aurindam Jana <aurindam.jana@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>
* Lazily create QMetaObjectsAaron Kennedy2012-05-241-1/+1
| | | | | | | | | | For internal QML built types, creating a metaobject each time is just wasteful. Additionally, as the property caches were always created from the intermediate QMetaObject, it was difficult to pass information directly from the compiler to the property cache. Change-Id: I769526b0edaaf16a86883f3065b75618b94e4077 Reviewed-by: Roberto Raggi <roberto.raggi@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-144-3/+85
| | | | | | | | | | 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: make sure that all data is sent on closeChristiaan Janssen2012-05-081-0/+5
| | | | | | Change-Id: I662a3865fec1e4d12d57389bfbe23d7221b6df16 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@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-256-443/+149
| | | | | | | | | 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>
* Do not use deprecated APIOlivier Goffart2012-04-241-6/+6
| | | | | | | Change-Id: I0c61f9cb4abe926d5f1e0a3acda7117d8d54efb6 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Debugger: Display selected item name in inspectorSimjees Abraham2012-04-197-10/+102
| | | | | | | | | 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>
* Debugger: Changes made for selection using Inspect ToolSimjees Abraham2012-04-192-14/+23
| | | | | | | | The selected item is shown in black transparent background. Change-Id: Ifc9d2892cc000041df6d9585f5c5adcca07abfb5 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Enabled widget free compilation of QtQuickDonald Carr2012-04-181-1/+0
| | | | | | | | | | There is no hard dependency of QtQuick on QWidget. This change makes the minor adjustments required to remove the build dependency altogether. This patch follows the path of least resistance bypassing any elements with a dependency on the legacy QWidget functionality. Change-Id: Ie3f47d3b4f60a1460dbb5d76a494a2c329469cc0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 08:20:29 +0000