aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* QmlDesigner.NodeInstances: Improve SceneGraph supportMarco Bubke2011-08-311-2/+2
| | | | | | | Change-Id: Ia5111f972836a1123fe857511325a82aef855449 Reviewed-on: http://codereview.qt.nokia.com/3967 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* corrected license headersThomas Murach2011-07-061-51/+19
| | | | | | | Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b Merge-request: 352 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1251
* Replace qt-info@nokia.com with info@qt.nokia.comhjk2011-07-061-2/+2
| | | | | | | Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018 Reviewed-on: http://codereview.qt.nokia.com/1187 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.NodeInstances: Move qmlpuppet to shareMarco Bubke2011-06-221-0/+186
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7 Reviewed-on: http://codereview.qt.nokia.com/634 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 11:44:28 +0000