summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Port from qAsConst() to std::as_const()Marc Mutz2022-11-142-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. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@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. Change-Id: I4ad19b07489630a4648b5d6ca4a8c074ed88827b Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 32d8cb010545f5f221689bd7f9a80281f62ad89d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Task-number: QTBUG-67283 Change-Id: I106d3a5d1a7b96250380b6f51a48f3b19d10e4d9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 811f060c37a58580e0697d0beb34a6f91efeeb41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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>
* Make texture sharing mechanism hidden and experimentalEskil Abrahamsen Blomfeldt2020-11-1122-868/+1
| | | | | | | | | | | | | | | The texture sharing mechanism has some issues still, and it is not strictly required in Qt 6.0. So we keep the code for now, but hide the feature and document it as experimental and unsupported. This makes it convenient to bring it back later, maybe with a revised API, when have more concrete use cases. The example is moved into manual tests for now, and can easily be brought back later. Change-Id: Icfe4841b329bebcf9d63d1e00a4f6ae613c5092f Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* CMake Build: Fix QtWayland examples linker errorsCristian Adam2020-11-055-5/+5
| | | | | | | | | | | | | | The examples have enabled only the CXX language, while the wayland code generation CMake helper function would generate a C file, which would not get compiled correctly. By removing LANGUAGES CXX, the examples will have the default CMake languages enabled: C and CXX. Fixes: QTBUG-88040 Change-Id: Ia79563b60b5bc140ad0f9e087198044b2eb67d9e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* CMake: Regenerate examples to set the WIN32_EXECUTABLE propertyAlexandru Croitor2020-10-2618-0/+72
| | | | | | | | As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Change-Id: I2e238dff7bdda6c47dfbe28e2a560ee4c25f3d02 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-2018-18/+18
| | | | | | Task-number: QTBUG-87661 Change-Id: I640a3c4281040309a6feb3585c4134190627d17d Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Fix examples to include IviApplication importEskil Abrahamsen Blomfeldt2020-10-053-0/+3
| | | | | | | | | | | In 3a8449ff0a821ab072f66ea43fed6925090fc4d8, we added support for IviShell in the compositor examples, but the change hadn't been updated after the types were moved into a separate import, so all examples fail on start-up. Change-Id: I08a88b775338471457060c8e45718c8da3f1e9ab Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Add iviShell support to example compositorsPaul Olav Tvete2020-09-233-0/+11
| | | | | | | | | | Now that XdgShellV6 is removed, some older Wayland applications (such as weston-terminal and weston-simple-egl in Ubuntu 18.04) would assert when run against our example compositors. Adding IviApplications let them run (although with reduced functionality). Change-Id: If28513f23d4cb362608119db8233eb2e47f794bb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* New input method protocol for use with Qt clientsEskil Abrahamsen Blomfeldt2020-08-261-1/+1
| | | | | | | | | | | | | | | | | We introduce an alternative input-method protocol, which is a one-to-one mapping to Qt's input method API. Input methods such as the virtual keyboard's hunspell integration is quite sensitive to the inner workings of the input method handling, both in terms of when state is updated and which updates are delivered when. With a one-to-one mapping we are able to match these expectations and keep a well-synchronized state. Task-number: QTBUG-85135 Task-number: QTBUG-85134 Change-Id: Id69c22a7b0885ea59f39fdcc8d663749af56c7ce Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update QML syntaxPaul Olav Tvete2020-07-311-1/+1
| | | | | Change-Id: Iaaac7328e75971aa2f0b50d9fb0437ade6f19cbc Reviewed-by: David Edmundson <davidedmundson@kde.org>
* Move WlShell types into their own importEskil Abrahamsen Blomfeldt2020-07-099-0/+9
| | | | | | | | | | | We want extensions to be in submodules in QML. [ChangeLog][WlShell] Moved WlShell types into QML import QtWayland.Compositor.WlShell rather than QtWayland.Compositor Task-number: QTBUG-68840 Change-Id: I7c3d2d05efdab86ea61affc6a9a0bc3e10835328 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move IviApplication classes into their own importEskil Abrahamsen Blomfeldt2020-07-091-0/+1
| | | | | | | | | | | | We want extensions to be in submodules, to make them easier to deprecate and replace when they become outdated. [ChangeLog][IviApplication] Moved IviApplication types from QML import QtWayland.Compositor to QtWayland.Compositor.IviApplication. Task-number: QTBUG-68840 Change-Id: Ib940b980b5e4fcd8a80b359efb0a0e6c42f32c06 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move XdgShell types into their own importEskil Abrahamsen Blomfeldt2020-07-0912-0/+12
| | | | | | | | | | | | | We want extensions to be accessible from submodules to QtWayland.Compositor, since this makes it easier to deprecate and remove things as they become outdated. [ChangeLog][XdgShell] Moved XdgShell types from QML import QtWayland.Compositor to QtWayland.Compositor.XdgShell. Task-number: QTBUG-68840 Change-Id: I74bf6e31dad1a05151f547ea5e5ff043128512cd Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move Screen -> CompositorScreen in examplesEskil Abrahamsen Blomfeldt2020-07-0912-10/+8
| | | | | | | | | | | | | We no longer support using types called Screen when QtQuick is imported. This also cleans up a couple of copy-paste errors, where Screen.qml is referenced from the .pro file without actually existing in the example. Task-number: QTBUG-85199 Change-Id: I7f456aabacaf6165d38fbe4bf951baf6d3dab9a6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove import versions from QML examplesEskil Abrahamsen Blomfeldt2020-07-0924-75/+71
| | | | | | | | | | | | | We no longer have to specify the version for QML imports, as it will just default to most recently available. The examples should follow best practices, so this cleans up all the QML in the examples. Note: Due to QTBUG-85443, we have to leave the QtQuick.Controls imports versioned for now. Change-Id: I237da0bd406fe1e06123bb47e29a7d921c64b5b5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove deprecated codeEskil Abrahamsen Blomfeldt2020-07-0720-1414/+0
| | | | | | | | | | | | | | | | | XdgShellv5 and XdgShellv6 have been deprecated in the compositor since 5.15, and wl-scaler since 5.13. These are now removed. Since the qwindow-compositor has not been updated for a long time, it depends on the outdated protocols. This change removes it, since it no longer represents best practices. This means we will be missing a proper C++-based compositor for now, so we will have to create a new one later. Change-Id: Icc6ef97c17e553f266c4145abeef26ddd631d6bf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* pure-qml: Rename Screen to CompositorScreenEskil Abrahamsen Blomfeldt2020-07-065-4/+4
| | | | | | | | | | After Window moved into Qt Quick, the Screen attached property is now available even without import QtQuick.Window. This causes conflicts with local types called Screen. Task-number: QTBUG-85199 Change-Id: I989e66a8111c0a23996902d9678bc85f238df288 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove last redundant autoCreatePopupItemsPaul Olav Tvete2020-07-021-1/+0
| | | | | | Task-number: QTBUG-75409 Change-Id: If3add1688b19a0c264026ad0acba8c6f30df38e9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Replace calls to deprecated QEvent accessor functionsShawn Rutledge2020-06-291-8/+8
| | | | | | | | | | | | | | | | | | | | Several event accessors were deprecated in qtbase/24e52c10deedbaef833c0e2c3ee7bee03eacc4f5. Replacements were generated by clazy using the new qevent-accessors check: $ export CLAZY_CHECKS=qevent-accessors $ export CLAZY_EXPORT_FIXES=1 $ ../qt6/configure -platform linux-clang -developer-build -debug -no-optimize-debug -opensource -confirm-license -no-pch QMAKE_CXX=clazy $ make $ cd ../../qt6/qtwayland $ find . -name "*.clazy.yaml" $ clang-apply-replacements . Task-number: QTBUG-20885 Task-number: QTBUG-84775 Change-Id: If822ba409f974f737dc46ac31f6e8e92cc1603cc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adapt to new QPointingDevice APIShawn Rutledge2020-06-263-17/+17
| | | | | | | | | | | | | | QTouchDevice has been replaced with a more general QPointingDevice. All input devices need detailed information and need to be registered via QWindowSystemInterface::registerInputDevice(). This patch is not doing that yet; it's just enough to get qtwayland to compile again. Done-With: Liang Qi <liang.qi@qt.io> Change-Id: Id3a2e475ed07294a1977004fc72b11e466acc216 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Use WaylandCursorItem over clients, window system cursor otherwiseShawn Rutledge2020-05-293-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pre-existing binding visible: cursorItem.surface != null implied that the surface would often be null; but in practice it was only null at startup. After entering a client window, whatever cursor it set would be retained when the mouse left the window. With client- side decorations, this could go unnoticed, because often the mouse would go across the titlebar or edge decorations on exit, and those would set the cursor back to a standard arrow. But in compositors that implement a lot of Qt Quick content of their own (server-side decorations and/or built-in features such as menus, docks etc.), that content cannot change the cursor that the WaylandCursorItem shows. Instead, we need the underlying window system cursor to be shown whenever the mouse is not hovering over a client window. As a drive-by, remove the inputEventsEnabled: false declarations from the examples, because WaylandCursorItem already does that internally. The pure-qml example is not fixed; it shows the window system cursor only when the compositor is a nested compositor. When it's not nested, you just have to move the mouse slowly enough to avoid "jumping over" the window edges. Or run clients that don't change the cursor. Pick-to: 5.15 Fixes: QTBUG-84391 Change-Id: I3e677f3e4314d01e5d27d8eea49b4cb315c29d03 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* CMake: Regenerate projectsAlexandru Croitor2020-05-2620-20/+100
| | | | | Change-Id: I51a365ef29277bfcb3a62d04954dbe109ab6eac7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"Liang Qi2020-04-291-0/+4
|\
| * Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-291-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/client/xdgoutput/tst_xdgoutput.cpp Regenerated CMake projects. Removed duplicate wayland source in tests/auto/client/xdgoutput/xdgoutput.pro. It's still referenced via the included shared.pri file. Regenerated the CMake project to adapt to that. Otherwise the CMake project fails to configure due to duplicate rules with a error like the one below CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command): Attempt to add a custom rule to output tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule Also use a workaround fix for configuring CMake standalone tests due to regression introduced by dd7e40b1086020f6a054957f4972720cd684 in qtbase. Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd
View Lorry Controller Status