aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Debugger: Code cleanup for Inspect ToolSimjees Abraham2012-04-162-23/+16
| | | | | | | | Code cleanup done for Inspect Tool. Member variables removed which were not required. Change-Id: I74ab43c4e8bf39d00a5428bb6219653b7887c46d Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QPointer used instead of QWeakPointerSimjees Abraham2012-04-164-17/+16
| | | | | | | | Correctly used QPointer instead of QWeakPointer in QuickViewInspector and Highlight classes. Change-Id: I579bd148e71803b029d7a036cdcb7255740dbd91 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Fix bug in Inspect ToolSimjees Abraham2012-04-135-47/+72
| | | | | | | | | | | | Changes made such that the reparenting of SelectionHighlight and HoverHighlight is not done. Now the overlay remains the parent for both. Reparenting of SelectionHighlight and HoverHighlight created issues when selection was done on QML lists. Even the highlight items were getting added into the lists. This fixes the issue. Change-Id: I116780408d62d2b3da0a17a92e11d6c4f63dd3dc Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Fix bugs in inspection toolSimjees Abraham2012-04-123-13/+47
| | | | | | | | | Incorrect display of hover and selection highlight for child items having rotation and a different transform origin corrected. Change-Id: Id25c5bf52b5c1abc3f98ac6bc90d89262cc4f2cd Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Inspect tool - changes made to highlight on selectionSimjees Abraham2012-04-111-0/+8
| | | | | | | | Changes made for the display of highlight on selection such that the highlight is more prominent. Change-Id: Iaf06bd04095be7b25881681e3f81c0fbf87df205 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlDebug: Enable/Disable toolAurindam Jana2012-04-104-12/+29
| | | | | | 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-105-34/+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-103-9/+98
| | | | | | | | | 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-1011-286/+121
| | | | | | | Combine the Selection and Zoom Tools into Inspect Tool. Change-Id: I2477e2b27f5dde5d74489ecf3c43a049e2ed3aa3 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Selection Tool HighlightAurindam Jana2012-04-101-2/+2
| | | | | | | | Show a light color overlay when hovering and a darker overlay on selection. Change-Id: I57c04840558a7345b7d5b0b8406c6e6dec72fde4 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fixed the crash in Zoomtool when the app is exited when ZoomTool is active.Simjees Abraham2012-03-282-5/+8
| | | | | Change-Id: Ibc97665ddf789bd10c5256c02b8471ec2f4e9855 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Initial checkin for ZoomTool implementationSimjees Abraham2012-03-268-3/+431
| | | | | Change-Id: I0f2c8906a48b0c1d45fb980a349a8ffb135130b5 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Add optional 'host' argument to -qmljsdebuggerSimjees Abraham2012-03-194-6/+18
| | | | | Change-Id: I5bb2e48e2ad2019b8a92f6f8842b88027fcd2d28 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>