aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: QmlPuppet as standalone toolMarco Bubke2022-11-091-195/+0
| | | | | | | | | | | | | The qmlpuppet is now a standalone tool. There is new a library too with the communication code. That is shared between the designer and the puppet. It's in a .cmake file so it can be included by the standalone tool if it is not part of a designer build. Task-number: QDS-5879 Change-Id: I2bc2a0b463fbb3e0c8c23d182abfd368cf87e968 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge remote-tracking branch 'origin/8.0'Tim Jenssen2022-09-221-1/+7
|\ | | | | | | | | | | | | | | | | resolved conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp src/plugins/qmldesigner/components/formeditor/formeditorview.cpp src/plugins/qmldesigner/designercore/exceptions/exception.cpp Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
| * Check for more dirty flagsKnud Dollereder2022-09-211-1/+7
| | | | | | | | | | | | | | | | | | | | This fixes an issue of the formeditor which did not update properly if components contain items that have one of zvalue, opacity or visibility attributes animated. Change-Id: I1b20f09177878419b2b18aaf94c84b6ae437be7d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Use SPDX license identifiersLucie GĂ©rard2022-08-261-24/+2
| | | | | | | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6Tim Jenssen2022-07-121-10/+10
|/ | | | | | Task-number: QTCREATORBUG-26600 Change-Id: I629c8cd1f497ed2dd354ff461aa890a77bdc2a01 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use changed properties to update 3D previewThomas Hartmann2022-06-131-4/+4
| | | | | | | | | EffectReference is always dirty and it is the only dirty flag. Instead, we update now if any property changed. Task-number: QDS-7079 Change-Id: I157cf2d3b15120c33f4a6b3f53e526d555c7f80c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Show form editor preview for 3D material root nodesMiikka Heikkinen2022-05-271-1/+1
| | | | | | | | | Fixes: QDS-6561 Change-Id: I62a06eb6c83b0a4813a1b20f91b09e17b04a1332 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Fix 3D formeditor previewThomas Hartmann2022-05-121-1/+1
| | | | | | | | | | I remember testing this and ContentUpdateMask seemed to work. This might have changed with Qt 6.3 and using AllMask instead, which works for all cases I tested should not have any negative impact. Task-number: QDS-6896 Change-Id: I648c10fe75df813ae25a54a13a862cad0228bfdb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Add preview of pure 3D component in form editorThomas Hartmann2022-02-221-0/+8
| | | | | | | | | | If the root node is a 3D node we show a preview similar to the state preview in the form editor. The size of the preview is hard coded as (640, 480). Change-Id: If7f96522b093c17422fa38102bffe11ede016063 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Do not create pixmap at component completionMiikka Heikkinen2021-10-261-7/+3
| | | | | | | | | | | | | | Creating an item pixmap will render the entire scene and clear all dirty flags, so we don't ever want to render just one item without checking if other items need rendering, too. So pixmap creation is removed from completeComponent(). Since completeComponent() already inserts the completed instances to the dirty instance set, this should not cause any problems; it just defers the rendering to the next collectItemChangesAndSendChangeCommands() call. Fixes: QDS-5271 Change-Id: Ic15dbb29f13875b966f4e3c3556a4ecd7194cdd6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlPuppet: Make sure root instance is in dirty list after size changeMiikka Heikkinen2021-09-091-0/+6
| | | | | | | Fixes: QDS-4474 Change-Id: If9c861e9c9e39c044e059742bbf7cad0d41c4e5b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
* QmlDesigner: Render effects on document levelThomas Hartmann2021-08-301-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Rendering effects requires actually rendering another item. The effect is defined by another item that is rendered instead of the original item. For items that have an effect we do not render the children, since the effect is only applied to the layer not the individual items. We set layer.enabled temporarily to false, this ensures the effect is not rendered as part of its parent item. To detect the effect we use the source property an check if it points to the ShaderEffectSource. If one of the children inside the effect is transformed we have to update the effect item. If layer.enabled or layer.effect is changed we set the dirty flag on the item and all children. Change-Id: Iff61ef950e62a7a598b4bfa181ea70cb144368f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmdDesigner: Enable rendering single items again for render puppetMiikka Heikkinen2021-08-251-3/+0
| | | | | | | | | | | Change the form editor rendering to be done by item basis instead of just rendering the entire scene (unified rendering). Fixes: QDS-2933 Change-Id: I999cbc834791bc6e96334eab8273d97e4f58975f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Execute pixmapChangedCommands only if items have changedKnud Dollereder2021-07-141-7/+16
| | | | | | | | This patch prevents continuous image updates by making sure to only execute pixmapChangedCommnds if an item is dirty. Change-Id: Icadc1d8a2a2298d18147b31fbed3fbc4205f0ea8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlPuppet: Use QQuickRenderControl to render 2D viewsMiikka Heikkinen2020-11-271-2/+2
| | | | | | | | | | | | | | | | | | Port QQuickRenderControl rendering used for 3D edit view also for 2D views. This also fixes the issue of only partially rendered form editor view for root items with non-origin position by adjusting the position to 0,0 on the puppet side via an extra injected item. As a result of the root item always being rendered at origin, the visualization of the root item offset is no longer visible in the form editor (the checkerboard background item). Change-Id: Ide29510ef52513340d205ed35ac35c8cce66715c Fixes: QDS-3159 Fixes: QDS-3175 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add states to ImageCacheMarco Bubke2020-11-101-1/+1
| | | | | | Task-number: QDS-2998 Change-Id: I8e65881181ae1010ef1f8bab92fa71d92c961bcd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Port 3D edit view to Qt6Miikka Heikkinen2020-10-201-5/+0
| | | | | | Task-number: QDS-2899 Change-Id: Iedbe5e8561e5ab71ef32922e69da43cd3cc57e90 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implement different render path for Qt 6Thomas Hartmann2020-10-091-4/+19
| | | | | | | | | | | | | | When building with Qt 6 or if qmlpuppet_unifiedRenderPath is set in the environment we switch to a different render path. In this case we use QQuickWindow::grabWindow() and render the root item. No composition is done in the Qt Creator process anymore. This is a similar approach we already take for the 3D view. Performance is acceptable and we fix rendering issues related to effects and layers. Change-Id: Ic963eca047e0bf16ca3a099ec94658ae2af0fb63 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix custom qml2puppet buildThomas Hartmann2019-07-311-3/+1
| | | | | | | | | The build of a custom qml2puppet was failing, because of utils/algorithm.h missing. We should minimize Qt Creator dependencies in the puppet. Change-Id: Iba8dd1a3979dbeeb1bfa860b50ba586bea20c7a7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* More Utils::toSet/toListhjk2019-07-041-1/+3
| | | | | | | ... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-10/+10
| | | | | | | * Update all files in share folder Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Qt Quick Designer: License change to Qt Commercial + GPLv3Alessandro Portale2015-09-181-12/+7
| | | | | | | | Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner.QmlPuppet: Fix compile for Qt 5.6Thomas Hartmann2015-07-141-1/+1
| | | | | Change-Id: I231bcf61e813db14c0958565cf76dd4df56b4e99 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner: Always test if there is a instance for an id or objectMarco Bubke2014-07-031-7/+11
| | | | | Change-Id: I90ff8861de8879e300932bd61afb29f8ec3b9fc4 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Fix rendering rendering of itemsMarco Bubke2014-06-241-3/+3
| | | | | | | | The else clause was wrong. It should be that it is not a node instance but it was that it was not a dirty node instance. Change-Id: I657bbc03826edcb9a1ea46f9c3b44404b2d3f31a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Always reset the items in the render loopMarco Bubke2014-06-241-0/+2
| | | | | | | To be sure the are not any more dirty. This can be no harm. Change-Id: I861243f1f4435b0dbdc2a6373ebfdfef12fb2627 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix Krazy warnings about duplicate includes.Friedemann Kleint2013-03-201-1/+0
| | | | | Change-Id: Ied32236a84d20225b1ca4a192f3a346fbfbd09b4 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QmlDesigner.NodeInstances: Polish items for data collectionMarco Bubke2012-10-191-0/+2
| | | | | | | | | | Change-Id: I3ca322ae72b546b0a55162f376a2895642c7a187 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.NodeInstances: Fix node updatingMarco Bubke2012-10-151-2/+1
| | | | | | | | | | Change-Id: I2aebcaf618251b85764712be7dd5dc3c863c3ba9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.NodeInstances: Fix rendering code pathMarco Bubke2012-10-111-0/+1
| | | | | | | | | | Change-Id: I2a479e85d7ea6f5803d78d3e2ce86849c882c5a3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.NodeInstances: Fix rendering of child items of componentsMarco Bubke2012-10-111-4/+21
| | | | | | | | | | Change-Id: I96d888bb97e334ff9a2a8fa3e8c2bcb931b247c1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner.NodeInstances: Rename SG to QuickMarco Bubke2012-09-261-1/+1
| | | | | | | | | | Change-Id: I2180704df244a715a078385a7ecbf852f41ca68f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.Instances: Refactor the qml2 puppetMarco Bubke2012-09-241-6/+6
| | | | | | | | | | Change-Id: Iaa7a744ecf13e011addc573a381ea523d2d50a55 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.NodeInstances: Shared memory for value changesMarco Bubke2012-09-111-0/+6
|/ | | | | Change-Id: I3c3455f411f18322a062f144e98461691d12ada8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.NodeInstances: Create effect items only in the render processMarco Bubke2011-08-311-0/+3
| | | | | | | Change-Id: I0506bf898582ba8e26a22f51737eae4d82f06c63 Reviewed-on: http://codereview.qt.nokia.com/4004 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Fix headerMarco Bubke2011-08-311-1/+1
| | | | | | | Change-Id: Ib272d772f6e8838b71c6ede8222acae4313ecae2 Reviewed-on: http://codereview.qt.nokia.com/4009 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Fix frame dropping for last frameMarco Bubke2011-08-311-2/+2
| | | | | | | Change-Id: Id70b1bc0af09293628fe2242f4bebeb30c1ae230 Reviewed-on: http://codereview.qt.nokia.com/4007 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Refactoring dirty to isDirtyMarco Bubke2011-08-311-1/+1
| | | | | | | Change-Id: I6344632a8570ad09e38c7d3dc093c42d758bf15a Reviewed-on: http://codereview.qt.nokia.com/3974 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* QmlDesigner.NodeInstances: Fix function call to parent classMarco Bubke2011-08-311-3/+4
| | | | | | | Change-Id: I4842b91c53b3d9f0b0bc6a950858ce482b173d1b Reviewed-on: http://codereview.qt.nokia.com/3970 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Remove unused codeMarco Bubke2011-08-311-8/+0
| | | | | | | Change-Id: Ibf585ef6f821f73be16888fea550bfe0e0b1bcd6 Reviewed-on: http://codereview.qt.nokia.com/3969 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>