summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qtwaylandv6.2.0-beta4Qt Submodule Update Bot2021-09-021-2/+2
| | | | | Change-Id: I5f7d386e8d1f2b856fb876ccd991f2fd19921319 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: I1a12c85775a8fccd6cded038ed4afc37533740ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Ensure versionless wrappers do not introduce a new variable scopeCraig Scott2021-09-012-4/+4
| | | | | | | | | | | | | Using function instead of macro prevented the wrappers from being able to pass back any variables set by the wrapped function in the calling scope. Prefer macros to avoid future changes which might do this from silently swallowing such variable setting. Task-number: QTBUG-96121 Change-Id: I293999c8054c2572e9145974a9ffac661f70bf35 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1998283f61e76928063dd46d7dfc0d2759d02855) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-09-011-2/+2
| | | | | Change-Id: I42d569f9303fc2311b38be4a69e5aa76ea9eac26 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: I9b4afed8dc11d7a15c6334e354d97e36595e7863 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Install plugins.qmltypes for IviApplication shellEskil Abrahamsen Blomfeldt2021-08-311-0/+1
| | | | | | | | | | | Amends db33032ff1cf66796d8fdcff5ce6f0ce99e0699e. This added install commands for plugins.qmltypes for all the shells except the IviApplication shell. Change-Id: I0c17d9d8d727ae35cda14398f88cc63205522ee0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit e2f54bf172f221b182eb0b6f542112d90b7c8810) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-301-2/+2
| | | | | Change-Id: I6f0c1959f0f76d8addf00650e113eec92bfdd5a5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Support builds with ConanIikka Eklund2021-08-262-0/+63
| | | | | | | | | | | | | | | | | | | Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94913 Change-Id: I18c941dafb959ced07f502bd37bebae4e4e91fec Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 169d738392b71c107c8d4e85ac3b9334a7e3401a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-251-2/+2
| | | | | Change-Id: Ifdc1e3839ef8641e97f6530e8f8a3d01e5c7666f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Keep reference to buffer until it has been replacedEskil Abrahamsen Blomfeldt2021-08-242-22/+32
| | | | | | | | | | | | | | | | | | | For the code path which uses QWaylandBufferMaterial, the buffer could potentially be deleted before the material had been updated, which could cause issues if the render thread was currently using the textures. In the default code path this was handled by keeping a reference to the buffer in the texture provider, but in the alternative YUV format code path, we did not increase the reference count of the buffer, so it would be deleted immediately when it was replaced rather than wait for the sync with the render thread. Task-number: QTBUG-95715 Change-Id: Ic6038ea8281e2a2e292d12150d1fffedb5c3b76e Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 6b9a27d77e226a3d0ce9fa9b4974f70c9ef4a30e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Implement wp_viewporter support for video buffer formatsEskil Abrahamsen Blomfeldt2021-08-231-1/+11
| | | | | | | | | | | | | | | | | | | Some EGL image formats (the YUV formats specifically) cannot be handled by the built-in node types in the Qt Quick scene graph and use a custom material and geometry setup. In this setup, the wp_viewporter source rectangle was ignored and the entire texture was always sampled. This caused problems e.g. for video frames supplied by GStreamer. [ChangeLog][Extensions] Support for wp_viewporter extended to cover less common buffer formats. Task-number: QTBUG-95464 Change-Id: I2504c6cd7d82e17d28e930a59d9ec71b25779acb Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 060024e2fc9335d4fc999253c9d6ed560c7ffb0c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ignore viewporter buffer size when buffer is nullEskil Abrahamsen Blomfeldt2021-08-231-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for viewporter says: "if the source rectangle is partially or completely outside of the non-NULL wl_buffer, then the out_of_buffer protocol error is raised when the surface state is applied. A NULL wl_buffer does not raise the out_of_buffer error." The intention here is that the viewport can be initialized before the buffer is actually attached to the surface, and the parameters will be kept for later. We simply skip the error condition when there is no buffer. [ChangeLog][QtWaylandCompositor] Fixed an issue in the wp_viewporter extension, where it would emit a protocol error if the viewport was configured before attaching a buffer to the surface. Fixes: QTBUG-95464 Change-Id: I71d09974dfe5e0f39ed79e7718e1e0d402547583 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 639bd92682f5f61f15f97f78ccd9791bec852b6c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-211-2/+2
| | | | | Change-Id: Ib7b5c71d7e93b3a1502842ae2c77f732a341c65e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-201-2/+2
| | | | | Change-Id: I201f2a11fed837b884e5a1b44b54b620729ef16a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-191-2/+2
| | | | | Change-Id: I4640e8c9b8bb6c91c1a26b94a982ecebe6f32f11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-181-2/+2
| | | | | Change-Id: I760eb9c7045e5906899d6c6d05075544a4468046 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix minor link error in ivi-compositor.qdocNico Vertriest2021-08-181-1/+1
| | | | | | | Change-Id: I573f4ddbeb87a063e913cf0a6521ddde7b34629d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 5177c3182817cd812ea922e72a5ee6982b4e4a21) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: I22b7d04aadf82f509a281875017c296ecf7089f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-171-2/+2
| | | | | Change-Id: I314ccb26d7eb446a219e1b341dc0fa519d6f62bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1715-15/+15
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I821f412f9dbe11ae99ffd888a7ab2ba415ed9379 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 453a6d899ea9f4cca4daec411bfe05d635ced534) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-161-2/+2
| | | | | Change-Id: Ic6165fb17863c089b922c8dbc9739f423adfa642 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix QDoc comment markersPaul Wicking2021-08-162-4/+4
| | | | | | | Change-Id: Ife862cfda6a597eb196573febc0583d9f266e6bf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 3417f49199aabe4e8db5294a482e87ecc0e4ac1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Expand documentation for server-side decorations exampleEskil Abrahamsen Blomfeldt2021-08-164-3/+72
| | | | | | | | | | | Add some code snippets and an image, and explain possible justifications for preferring server-side decorations. Change-Id: I936e51a4bb3c491689a579bd4fb99505dda4107b Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 5ce62009fc9d91850d4a0e39560b3be9c0cd5bd8) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Expand documentation of Pure QML exampleEskil Abrahamsen Blomfeldt2021-08-166-16/+127
| | | | | | | | | | | Add details about what customizations are specific to this example. Task-number: QTBUG-91674 Change-Id: Icf2dd4fb2bcbd230bbadbb01e5a57f481ad178eb Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit ea929b6fa5a90602e6f1fb597e3edfed9e6de3a7) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Add Overview Compositor example documentationEskil Abrahamsen Blomfeldt2021-08-163-1/+62
| | | | | | | | | | | There was basically no documentation at all for this example. Task-number: QTBUG-91674 Change-Id: I789cc883565feb6f502908cc1b22815594b0de16 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 12401c6f116f26e38182c90dc6920e4610f0e90d) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Expand documentation for spanning-screens exampleEskil Abrahamsen Blomfeldt2021-08-163-3/+53
| | | | | | | | | | | Add code snippets, screenshot and justification. Task-number: QTBUG-91674 Change-Id: I96bf981db2121b0b8135fb83fb9ae16fda60c8c3 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 089068e5c63f5cd80f6e59447df6a4d4facb9758) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Expand multi-output example documentationEskil Abrahamsen Blomfeldt2021-08-164-12/+49
| | | | | | | | | | | | Add code snippets and an image, and explain some details in how the two different scenes are set up. Task-number: QTBUG-91674 Change-Id: If45b2ef78820d57f0ad3ec40c76a88a250ea749b Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 7a7bef54508a6897bec42f4d3e52cc38c09085fa) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Expand multi-screen documentationEskil Abrahamsen Blomfeldt2021-08-164-9/+57
| | | | | | | | | | Add some snippets to the example, as well as some explanation on certain tricks that might not be obvious. Task-number: QTBUG-91674 Change-Id: I8370afa0e70c98a4c152c8f753d9f5e37aa79da2 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fb9fbb2647b723693a0c8135b3475adc794aaeaf)
* doc: Add documentation for TextInputManagerEskil Abrahamsen Blomfeldt2021-08-162-2/+33
| | | | | | | | | | | This adds some information about TextInputManager which was missing, and also consolidates phrasing with QtTextInputMethodManager documentation. Fixes: QTBUG-64652 Change-Id: I51e1c86a8e06057248c7400f6e1ba5d38eb98dc5 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit e2df5571613f09248d26c57ccab19f85286ab6d1)
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-1231-31/+31
| | | | | | | | Task-number: QTBUG-95170 Change-Id: I60fd4ef84fb4887294bde766790b279d12f1288a Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 3c04dd8b26e276ae7649021135496d1ed3b111f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandv6.2.0-beta3Daniel Smith2021-08-121-2/+2
| | | | | Change-Id: I07c2e3f3e4bdd1c80d33532fc79beb9325c9fc01 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-111-1/+1
| | | | | Change-Id: I2d544a1e5876eb2f10b99d5dcd240275f57fbd8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-101-2/+2
| | | | | Change-Id: I36c7e961de3650dabe7cbe619c034f871a9fbe9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-041-2/+2
| | | | | Change-Id: I986e8a24ff9125f5c86c33fe3338e304bdfa755f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Delete texture resource immediately to prevent race on shutdownRobert Griebl2021-08-041-2/+1
| | | | | | | | | | | | | | | Calling deleteLater on the SG texture leads to a race condition when shutting down the compositor: the deleteLater handler is called after the global RHI shutdown, leading to crashes in the render thread and/or debug outputs complaining about leaked texture resources. Fixes: QTBUG-95394 Change-Id: I19525507597e2ecdb534e57406b4fe1d34fcf4de Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit d68bd21b9d144fcc4552209591d353d791f498ac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Cleanup up all subsurface QQuickItems correctlyDominik Holland2021-08-021-0/+1
| | | | | | | | | | | | | | | When showing a surface with a subsurface in a QML based compositor, the subsurface QQuickitems are now destroyed when when main surface QQuickItem is destroyed and not just when the surface is destroyed. This prevents subsurface QQuickItems piling up when showing and hiding the client surfaces e.g. inside a StackView. Fixes: QTBUG-94602 Change-Id: I006a6a763d4daf560ba2a7b6f83e1de3e3c48906 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 5463a04097ee7824b2032fb058e289cf62bfd315) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adjust INTERFACE_MODULE_HAS_HEADERS property nameAlexey Edelev2021-08-022-2/+2
| | | | | | | | | | | After introducing the _qt_module_has_headers target property, it's better to replace the INTERFACE_MODULE_HAS_HEADERS use by _qt_module_has_headers since properties duplicate each other. Change-Id: Ia1b35cc21bf31fce593c374d196aa450e6fd7e08 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit aa35a8f2421c7ef0b6d3686728fe5c6db6d97c4a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-08-021-1/+1
| | | | | Change-Id: Ied01f466542147fbe965d359b0379768e12c9a56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-291-2/+2
| | | | | Change-Id: Ibff403aa81289f9da67f540b4c99c3d1eb76b500 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-281-2/+2
| | | | | Change-Id: I2e271238dc439430fd2ebd0ae7e7dea594749b1a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandv6.2.0-beta2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I97ecf2062a537ca899c20f29f93e96d8270de40e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I447ed44055e423f0d0b9e29ed828d1d7a50310fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: Icbb3222e2380469713b23310a92349b44b67df73 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: Iaac16a142d8192484868ef4d7950e6b9967196ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I376b0931b5db841f3666fdd0b4ec25527da58dcf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I98e745e6e61a05350a296e700760862a459090ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-211-2/+2
| | | | | Change-Id: I1295adb8f9e5478bfaa654b72a7529467232d1d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: I494530acee63b443ad972f3776ac8f098396c3f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace Freenode reference with Libera.ChatKai Köhne2021-07-201-1/+1
| | | | | | | | | Also remove #qt-lighthouse channel, which is abandoned. Change-Id: Ide45c569fb73eb4949470f7d576c0b5ef3eb9cfb Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> (cherry picked from commit 16b14e6998bbc53d347becf244006ba769f940ed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtwaylandQt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: Iaabb6986340e3d4c6bbc988f68533739f03fbaa5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status