summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Correct license for examples filesLucie Gérard2024-04-0418-18/+18
| | | | | | | | | | | | | Example takes precedence over build system file type. According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I4f07260d6121ca3f95d12ca399f3301d97d33f52 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* doc: Add documentation for cmake functionsEskil Abrahamsen Blomfeldt2024-02-132-2/+8
| | | | | | | | | | | | | This adds documentation for the cmake functions used to generate binding code for protocol extensions. Since the Wayland Client library did not have any documentation landing page, it also adds that. This currently only links to the cmake function, but it can be extended to include other APIs later if we add them. Pick-to: 6.7 Fixes: QTBUG-114147 Change-Id: I07d8dbe3bc32e5845482fe3e69ec6ba94897331b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Remove QML explicit version numbersKai Köhne2024-02-021-1/+1
| | | | | | | | | Since Qt 6, we don't recommend using explicit version numbers anymore. Pick-to: 6.6 6.7 Change-Id: I5b833ca9d5dc7a39ddd38b855568ecb642524655 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Add missing '\' in QDoc commandPaul Wicking2023-12-291-1/+1
| | | | | | | Fixes: QTBUG-120393 Pick-to: 6.7 6.6 Change-Id: I9a453f0c2bfb0e1c605c8db3e6a7d7c2e4282ef8 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Make custom-extension example work on Nvidia EGLStreamsPaul Olav Tvete2023-11-132-0/+6
| | | | | | | | Fixes: QTBUG-111022 Pick-to: 6.6 6.5 Change-Id: I766eeb83dc019acab7fe0c8d29412ea28b8fbc56 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
* Doc: Add example category for Wayland Compositor examplesInkamari Harjula2023-09-042-0/+2
| | | | | | | | | Added example category to custom-extension and minimal-cpp. Task-number: QTBUG-116340 Pick-to: 6.6 Change-Id: I1a767614831f88378e8b311f0112ed408b2bba76 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Use correct module identifiers in QML documentationTopi Reinio2023-06-081-1/+1
| | | | | | | | | | | | | | | | Multiple \qmlproperty, \qmlmethod, and \qmlsignal topics used an incorrect QML module identifier. With upcoming changes to QDoc these will start to generate documentation warnings. Fix the commands to either use the correct identifier, or remove the identifier as QDoc is capable of resolving the parent QML type without it. In passing, fix a documentation linking issue. Pick-to: 6.6 6.5 Change-Id: I5a562acc5f135d36c036ea1c1cc56218c23833b8 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
* Doc: Use the \examplecategory macro to tag examplesTopi Reinio2023-04-1110-10/+10
| | | | | | | | | | | | | | | | The '\meta category' command was used for tagging examples with a specific category, used in Qt Creators Welcome mode. As we want to also generate lists of examples belonging to a category elsewhere in the documentation, replace the command with a macro that expands to the original \meta command and also adds the example to a group using the \ingroup command. This way, the category names can be used as arguments to the \generatelist or \annotatedlist commands. Pick-to: 6.5 Task-number: QTBUG-112731 Change-Id: I86a8a71204d1dd0665ca6d8c40438c78817c007a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Correct outdated info about text input methodsEskil Abrahamsen Blomfeldt2023-04-031-10/+8
| | | | | | | | | | | The fancy-compositor now supports multiple text input methods at the same time, but the documentation had not been updated to reflect this. Pick-to: 6.5 Fixes: QTBUG-110924 Change-Id: I0c23f06db7eefec6442eff50f75d0f78ba2203d3 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: David Edmundson <davidedmundson@kde.org>
* Rename pure-qml to fancy-compositorEskil Abrahamsen Blomfeldt2023-03-0614-48/+48
| | | | | | | | | | | | | | | The pure-qml name made sense when the example was made, but since then we have added a lot of examples that are all in Pure QML. Minimal QML covers the basics of how to set up a compositor in QML, but Pure QML shows a more advanced use case, with animations, windowing system features, virtual keyboard support, etc. To make it clear what the example is demonstrating, we call it Fancy Compositor instead. Task-number: QTBUG-110993 Change-Id: Iad1cfb11b6461858ebcdaa388ed16e1fd3ec8805 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Revamp/document custom-extension exampleEskil Abrahamsen Blomfeldt2023-03-0216-61/+273
| | | | | | | | | | | | | | | This is a very useful example which was unfortunately undocumented. It also needed some clean-up in the code, and as part of writing the documentation, it became clear that it would be an easier demonstration to follow if the QML client was more similar to the C++ client, so that they were simply two implementations of the same spec. Fixes: QTBUG-110919 Change-Id: Ia4476cda34056e28722af6639f95d8c87819681a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* doc: Add missing documentation screenshotsEskil Abrahamsen Blomfeldt2023-02-286-0/+6
| | | | | | | | | | | A few examples were missing screenshots. Having something visual makes it a lot easier to understand the example without having to compile and run it. Pick-to: 6.5 Task-number: QTBUG-110993 Change-Id: I2c95262f79a94a5da12421e9c19e42ff73a178c0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* doc: Add compositor examples to Embedded categoryEskil Abrahamsen Blomfeldt2023-02-2810-0/+10
| | | | | | | | | | | Qt Wayland Compositor API is perfectly suitable for desktop as well, but is primarily used on embedded systems and that is where the ability to build your own platform, including a custom compositor, yields the most power. Pick-to: 6.5 Change-Id: Icb5827b29f896cf6835bdd37fb003a4abbef9f94 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* doc: Remove category from examples docsEskil Abrahamsen Blomfeldt2023-02-2811-37/+32
| | | | | | | | | | | | | | Remove redundant categorization from example title as according to example guidelines. The examples are already categorized under Qt Wayland Compositor Examples, so adding it to the title makes the list a bit cluttered. Pick-to: 6.5 Task-number: QTBUG-110993 Change-Id: I91ad127611c7b1e4d8c558377bc5f46e0ec28a41 Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move server-buffer example to manual testsEskil Abrahamsen Blomfeldt2023-02-1621-589/+0
| | | | | | | | | | | This is undocumented and demonstrates an experimental feature which was never maintained or exercised. It's a nice feature, so we keep the example around for when we get the time to bring it back. Pick-to: 6.5 Task-number: QTBUG-110993 Change-Id: I045cb2ef02a50017a26226c493607100ea0f1b95 Reviewed-by: Inho Lee <inho.lee@qt.io>
* Move hwlayer-compositor example to manual testsEskil Abrahamsen Blomfeldt2023-02-148-204/+0
| | | | | | | | | | | This was never actually listed as part of the examples, and it demonstrates an experimental feature which was never really in use and hasn't been maintained. So lets move the example to manual tests so that it can easily be revived later if we decide it's needed. Change-Id: I5a70701d34d76b4a8d42cf5945341d1f6e37a28b Reviewed-by: Inho Lee <inho.lee@qt.io>
* compositor: Fix QML errors in multi-screen exampleEskil Abrahamsen Blomfeldt2023-02-102-1/+2
| | | | | | | | | | | | | | | | The output property was not hooked up to the surface item, causing the error "qrc:/qml/main.qml: Setting initial properties failed: Chrome does not have a property called output" In addition, when emulating screens, the model is a ListModel, and thus there is no modelData to access (nor would it make any sense to assign this to the screen property). We just set the screen to be the (only) screen on the system in this case. Pick-to: 6.5 Task-number: QTBUG-110993 Change-Id: I7f6ec15dd038605bd0d94a34600ecbf22aad9878 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Documentation for the minimal-cpp examplePaul Olav Tvete2023-02-105-9/+85
| | | | | Change-Id: Ib06f5360c19e7656dcda5555e04b0f8f8a8e8d50 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Fix documentation warningsTopi Reinio2023-02-071-1/+1
| | | | | | | | | | | * Wiggly example has been removed. * Remove broken link to 'macros' from QWaylandQuickExtension header reference as unnecessary. Pick-to: 6.5 Change-Id: I17c9db09e7d0a649ab3a37ed867d4f81e039d485 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Improve examplesBernd Weimer2022-11-2522-102/+120
| | | | | | | | | Updated signal handlers to new syntax to reduce noise (warnings). Allowed to build examples with subfolders in one step, updated from deprecated WlShell to XdgShell, etc. Change-Id: If821363ffd1b38ea1d152f5a044b0609cf739014 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-102-4/+4
| | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: Ia64c6615ee81f7ad5d0658449b0ee347c3db8c29 Reviewed-by: David Edmundson <davidedmundson@kde.org>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-2321-21/+21
| | | | | | | Task-number: QTBUG-105718 Change-Id: Icb25ea4e07a38eea81f55ed59c6d3b9d37602626 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-0821-0/+63
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: Ib014757184540728f40df71cd580f01e85fbbb56 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use QColor::fromString instead of some deprecated functionsJiDe Zhang2022-07-051-4/+4
| | | | | | | | | It's a follow-up of a series changes from 78b6876974d2cea087cb229257097052dad5fcf7 in qtbase. Pick-to: 6.4 Change-Id: I4ad19b07489630a4648b5d6ca4a8c074ed88827b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-1076-3451/+151
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I106d3a5d1a7b96250380b6f51a48f3b19d10e4d9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* QtWaylandClient: use the CMake exports.h supportThiago Macieira2022-04-281-1/+1
| | | | | | | | | | | | The one in qtwaylandglobal.h was wrong. It just happened to work on Linux because the lack of import wasn't an error... until GCC 12 with -mno-direct-extern-access. Pick-to: 6.3 Change-Id: If05aeeb7176e4f13af9afffd16e8535b469f9158 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-227-350/+0
| | | | | | Pick-to: 6.3 Change-Id: Ifa372bef54747f0d933916b31bbd31a269e38a63 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-02-1922-212/+78
| | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I3ce281ae1fb44c8d54ee09860ddadd3dbbdf7271 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: Ifded6e94bf4d46cbb5aa5c43e96b9dea05a943ba Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-154-18/+18
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I4906db476df58ba248f415ef150551a88b942379 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Introduce new qt-shell and an API for custom shellsPaul Olav Tvete2021-12-0233-1/+2304
| | | | | | | | | | | | | | | | | | | | | | Adds a new API for writing custom shell extensions. This API is supported, but semi-public. Binary compatibility is not guaranteed. Also adds qt-shell, a new shell that maps directly to the QWindow API, and provides functionality that Qt provides on other window systems, such as absolute window positions and window activation. This shell is not intended for use on the desktop. This is a squashed commit of a development branch consisting of approximately 60 changes. Contributors: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Paul Olav Tvete <paul.tvete@qt.io> Task-number: QTBUG-94330 Task-number: QTBUG-91542 Change-Id: I419b6bd8179fe03e4da47d328c7ff4b4795b8a91 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* example/tests: update com.theqtcompany to io.qtLiang Qi2021-10-266-6/+6
| | | | | | | Pick-to: 6.2 Fixes: QTBUG-96370 Change-Id: Id0fc8ba2b552f7ab99fa208210c5bad016c3a043 Reviewed-by: Inho Lee <inho.lee@qt.io>
* Support different text input protocolsLiang Qi2021-10-071-0/+1
| | | | | | | | | | | | | | | | | | | from clients and one compositor at same time. For compositor side, just need to have TextInputManager and QtTextInputMethodManager together. For client side, set QT_WAYLAND_TEXT_INPUT_PROTOCOL env to choose: * If the env is unset(empty) or invalid, it will search qt_text_input_method_v1 and zwp_text_input_v2 in order * Set as "qt_text_input_method_v1" or "zwp_text_input_v2" if compositor supports * Set as "zwp_text_input_v2;qt_text_input_method_v1" Change-Id: Ieec293ff412bf2d3e5ca9c69a951bfe1899cc808 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Fix incorrect linkTopi Reinio2021-09-171-1/+1
| | | | | | | | | | Fixed a typo in the QML type name 'XdgToplevel', and switched to use a short-hand format for the link. Pick-to: 6.2 6.2.0 Task-number: QTBUG-95860 Change-Id: If992f9303b7d1c7215f0a395f09399a1727a90eb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1715-15/+15
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I821f412f9dbe11ae99ffd888a7ab2ba415ed9379 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Fix QDoc comment markersPaul Wicking2021-08-162-4/+4
| | | | | | Pick-to: 6.2 Change-Id: Ife862cfda6a597eb196573febc0583d9f266e6bf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* doc: Expand documentation for server-side decorations exampleEskil Abrahamsen Blomfeldt2021-08-133-2/+70
| | | | | | | | | 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>
* doc: Expand documentation of Pure QML exampleEskil Abrahamsen Blomfeldt2021-08-135-15/+126
| | | | | | | | | 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>
* doc: Add Overview Compositor example documentationEskil Abrahamsen Blomfeldt2021-08-133-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>
* doc: Expand documentation for spanning-screens exampleEskil Abrahamsen Blomfeldt2021-08-133-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>
* doc: Expand multi-output example documentationEskil Abrahamsen Blomfeldt2021-08-134-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>
* doc: Expand multi-screen documentationEskil Abrahamsen Blomfeldt2021-08-114-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>
* Doc: Fix minor link error in ivi-compositor.qdocNico Vertriest2021-07-261-1/+1
| | | | | | Pic-to: 6.2 Change-Id: I573f4ddbeb87a063e913cf0a6521ddde7b34629d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* doc: Expand ivi-compositor example documentationEskil Abrahamsen Blomfeldt2021-06-035-9/+106
| | | | | | | | | | The documentation of the ivi-compositor example was very abbreviated. This adds pictures and code snippets, as well as explaining context and use cases. Task-number: QTBUG-91674 Change-Id: Iad62daf0864312d5e5a4caa3651752e5c9540097 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: Expand the Minimal QML exampleEskil Abrahamsen Blomfeldt2021-06-033-2/+97
| | | | | | | | Include screenshots, code snippets and justification. Task-number: QTBUG-91674 Change-Id: I4de54439e34f49dc5d361d1cdd86be75a3fa06eb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix activation animation in Pure QML exampleEskil Abrahamsen Blomfeldt2021-05-191-2/+2
| | | | | | | | | It is actually the toplevel interface that has the activated state in XdgShell. Due to this, the activation animation would never run, even when XdgShell was in use. Change-Id: Ic939d360ad6790cbe6a1656c44cf515ed09f697c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix spanning-screens exampleEskil Abrahamsen Blomfeldt2021-05-181-2/+6
| | | | | | | | | | The spanning-screens example didn't actually offset the window contents on the bottom screen output. Tested this with 5.15 as well, and it did not work there either. Adding a parent item for offsetting the object works, so do that as an easy band-aid. Change-Id: Ie3311928531c4ab23e46fdd1fdcf5d4813fc5100 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Don't use deprecated APIPaul Olav Tvete2021-05-141-6/+4
| | | | | | | | | | QExposeEvent::region() is deprecated. Fixes: QTBUG-93751 Pick-to: 6.1 Change-Id: Idaff6fdc4c88e70696ba0074e26db3505c48b9d0 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: David Edmundson <davidedmundson@kde.org>
* Fix leak in multi-output compositor examplesEskil Abrahamsen Blomfeldt2021-01-046-0/+18
| | | | | | | | | | | | | | | | | When closing windows in e.g. multi-output, you will see warnings that textures are leaking because the current context is not shared with the context owning the texture. The way Qt Wayland Compositor internals are made, they depend on AA_ShareOpenGLContexts to be set, because buffers are consistently referenced across window/context boundaries. Change f1407493d6d25f24a3c71fbcedc00598baa44b56 mentions the requirement on EGLStreams, but this is also required on multi-output compositors to avoid leaks (and possibly sometimes crashes on some drivers). Task-number: QTBUG-87597 Change-Id: Ib0ccc61dee5dbc63704b0af1432fbf69645d39eb Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* CMake: Regenerate projects using pro2cmake one last timeAlexandru Croitor2020-12-095-0/+281
| | | | | | | Pick-to: 6.0 Change-Id: Ia5383c8ac8b375e493ae1c73ecc1270f857be24d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>