summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate projectsHEADdevAlexandru Croitor7 days3-3/+4
| | | | | | | | We need the qt_add_tool changes to successfully configure qemu builds. The rest of the changes are just to be in sync with the .pro files. Change-Id: I64e92edc2486a71c88bd964a07adf502481b200d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Move WlShell types into their own importEskil Abrahamsen Blomfeldt7 days21-118/+257
| | | | | | | | | | | 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 Blomfeldt7 days12-52/+168
| | | | | | | | | | | | 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 Blomfeldt7 days26-255/+397
| | | | | | | | | | | | | 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 Blomfeldt7 days12-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 Blomfeldt7 days24-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>
* Fix inconsistent signedness in qtwaylandscannerPaul Olav Tvete7 days1-11/+11
| | | | | | | | Use uint32_t everywhere for id. This is what libwayland does. Fixes: QTBUG-73098 Change-Id: Ie9564e59001cd9b29481d982b3136a4f31ece717 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Use --strict option for wayland-scannerPaul Olav Tvete7 days2-4/+4
| | | | | | | | Make protocol definition errors build errors. Task-number: QTBUG-73100 Change-Id: I1987bb93117f3bd017449f47eeb7e272597563dc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Stop using deprecated wayland-scanner argumentPaul Olav Tvete7 days2-2/+2
| | | | | | | | The argument "code" is deprecated. Use "public-code" instead. Task-number: QTBUG-73099 Change-Id: Idc8dca127581e07b81d7174ece3312c27b6ba9db Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Use wl_surface.damage_buffer on the client sidePaul Olav Tvete9 days6-6/+28
| | | | | | | | | Prefer the newer, recommended damage_buffer when the compositor supports it. Fixes: QTBUG-74929 Change-Id: I9107966910b616a666931404a7b41bfac14c22c0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Support wl_surface.damage_bufferPaul Olav Tvete9 days7-20/+81
| | | | | | | | | Add compositor support for wl_surface.damage_buffer requests. This also required updating wl_compositor to version 4. Fixes: QTBUG-74927 Change-Id: I887ed04e60fe14ecce7df6a517950b0091e2ad54 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Remove autogenerated .qrc file in compositor importEskil Abrahamsen Blomfeldt9 days4-32/+28
| | | | | | | | | | This code would unconditionally generate a qrc file for two .qml files instead of just adding the qrc file to the repository for some reason. This caused problems in the conversion to cmake. Change-Id: Ib859e51155847f72d646ce174259d3b8ba5ca93d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update QtWayland.Compositor version to match Qt versionEskil Abrahamsen Blomfeldt9 days9-30/+27
| | | | | | | | | | | | | | | | | The new convention is to match the C++ module version in the QML import. QtWaylandCompositor is technically a new type, since it was previously named QtWayland.Compositor, but since it might make porting easier, we keep the revision history for QtWayland.Compositor intact and keep \since tags in documentation etc. This also removes the QtQuick.Window import from the QML files (the Window class has been moved to QtQuick) and removes the versioned import per the new standard. Task-number: QTBUG-68840 Change-Id: I40483c7e16d92915adf08d0ff3c5d48af04db6af Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove deprecated codeEskil Abrahamsen Blomfeldt9 days55-10425/+21
| | | | | | | | | | | | | | | | | 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>
* Remove checks for old Wayland versionsPaul Olav Tvete10 days3-19/+1
| | | | | | | | | Now that the minimum libwayland version is 1.15, there is no point in checking whether the version is greater than 1.10. Task-number: QTBUG-73636 Change-Id: I75a97bec7e464aa6b04e21d1c23566d17ac7684a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* pure-qml: Rename Screen to CompositorScreenEskil Abrahamsen Blomfeldt10 days5-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>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot13 days1-2/+2
| | | | | Change-Id: Idc274bc023de6c406c1f075ff1a384624bc4d7e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update libwayland requirement to 1.15.0Paul Olav Tvete13 days3-11/+11
| | | | | | | | | [ChangeLog] libwayland 1.15.0 is now required. Fixes: QTBUG-73636 Change-Id: I585bb80c7d14ebfceb623b55cf7959121121599f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot14 days1-2/+2
| | | | | Change-Id: I9a5301379e5b3c47fdd37b3ab95296fba2ab0fcb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* Update CmakeLists for qrc updateEskil Abrahamsen Blomfeldt2020-07-022-14/+12
| | | | | | | | | The CmakeLists file was not updated when the .qrc was changed to include precompiled .qsb files. This amends ad21c33475ce9e033fc79140908c641d1424fa3f. Change-Id: I01647eb03d9fe3311e7fa312fec7512832dc61a5 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-07-021-2/+2
| | | | | Change-Id: I922aac4babf0f15a15907ce7c6e4870d8916cd1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-07-011-2/+2
| | | | | Change-Id: I879a1f5ac4b1744e35a46b66507fa900d8bb2956 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-07-011-2/+2
| | | | | Change-Id: Ie31a1a1951522d367341f7288f371d320f04edb5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-307-11/+11
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Ia626b9fbc2e4215cb9232ef9bcb71742d62dff4e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-301-2/+2
| | | | | Change-Id: Ic8baa61531b27c7ee8718c7ad87d97b6297d3622 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-291-2/+2
| | | | | Change-Id: I78a3d99f688ae12036bfb2dd7ede20741ca0a4df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-291-2/+2
| | | | | Change-Id: I441e7f0fca52cc55bb858adab13855e9eacd401f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace calls to deprecated QEvent accessor functionsShawn Rutledge2020-06-296-17/+17
| | | | | | | | | | | | | | | | | | | | 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>
* Add spaces around '+'Jide Zhang2020-06-291-2/+2
| | | | | | | | | Like most other Qt coding styles, the necessary spaces should be added to the sides of the '+' Pick-to: 5.15 Change-Id: I6fdbc6b24861e7a75633354a0ded636b1a38cd21 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Declare QWaylandDisplay::findExistingCursorTheme noexceptShawn Rutledge2020-06-261-1/+1
| | | | | | | | | | Fixes error: exception specification in declaration does not match previous declaration Amends 35efe87ccc20bd80e60d23d5ec2a9581ad5e32b9 Change-Id: I7e27ffd5bb3aa4c71680809268d86ba25242833a Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-261-1/+1
| | | | | Change-Id: I7510182d39702e4aa9e6c2f4bfb0cb5e13eb4cad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Adapt to moving of UNIX services/themes into QtGuiFriedemann Kleint2020-06-265-10/+2
| | | | | | Task-number: QTBUG-83255 Change-Id: I4770b796eb90c1ff76db940cd0cda44ea47648fa Reviewed-by: Liang Qi <liang.qi@qt.io>
* Adapt to new QPointingDevice APIShawn Rutledge2020-06-2618-113/+116
| | | | | | | | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-261-2/+2
| | | | | Change-Id: I461155f4bc2d26a6fe2db0fd79ceff47f4508439 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-251-0/+1
| | | | | | Task-number: QTBUG-85179 Change-Id: I7d327e91209e882095bbcf548a8de930a12e1a4e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Unify "wayland components" qt_find_package() callsAlexandru Croitor2020-06-162-9/+1
| | | | | | | | | | | | | | | So that the top-level call in src/CMakeLists.txt finds all the components, rather than doing it separately in each directory. This should prevent issues with dependency tracking of found packages even after the revert of dd7e40b1086020f6a054957f4972720cd6849280 in qtbase which is found at 8ddd3ee60bff1197b251feadf871fdaeb995ef3b. Amends 6319bc72e2dc63175ca797ee3042955f852e008f Change-Id: I05eef9db2de30a61b1aee532edc331b33fc027fb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <hausmann@gmail.com>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-161-2/+2
| | | | | Change-Id: Ia8a647e1fece5859744a7a085a6ffb080ff3f86b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update to changes in QSGMaterial APIEskil Abrahamsen Blomfeldt2020-06-162-2/+3
| | | | | | | | | The createShader() virtual function has been extended to take a renderMode argument. Task-number: QTBUG-78673 Change-Id: I6213c71c0ecbe33fc7301c1fc1eb80cf7e8a5090 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandLiang Qi2020-06-166-10/+7
| | | | | | | | | | | | | | | | | | Remove FontDatabaseSupportPrivate/fontdatabase_support-private in the libraries dependency. The libraries were removed in qtbase in 6be9830d865be32f224e15d13ddefd9c7e176553 and the functionality is now in QtGui. Remove PlatformCompositorSupport mentions, it was removed in qtbase in 7172b5112e5dbf0cb63dec68d2f916a323748aa1, and functionality moved to QtGui. Add explicit package dependency on OpenGL, in case if qtdeclarative modules are missing, so that qtwayland can still be built without qtdeclarative. Change-Id: I5e8ec4cddd293e52c288ba629e6ba954c689a803 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-151-1/+1
| | | | | Change-Id: I9efb1281c9034477a9c7e94fa93ba2d9ba798287 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-151-2/+2
| | | | | Change-Id: I90af5e5c7b663c5c28acecfb43a4d3a4beb6b86b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-121-2/+2
| | | | | Change-Id: Ibdfdef0801c94715fca8feff499024b5540c2fd3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-121-2/+2
| | | | | Change-Id: I1cba03e0d6db6c830907eaebd1920ba73decffb4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-111-2/+2
| | | | | Change-Id: Idaa36b0174baf9518bd3c35e3b0a328d277b6c5e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt6: Port QtWayland from QStringRef to QStringViewKarsten Heimrich2020-06-112-4/+4
| | | | | | Task-number: QTBUG-84319 Change-Id: I5dc2f4506c149e5f2793cd7cab083278b93a980e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Adapt to moving EventDispatchers to QtGuiFriedemann Kleint2020-06-115-10/+2
| | | | | | Task-number: QTBUG-83255 Change-Id: Iea32600c1d2443c86723653a4fb8b568363cd796 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Initial work to port the quick item materialLaszlo Agocs2020-06-1119-134/+211
| | | | | | | | | | | | | | It should be possible to make this working on RHI-on-OpenGL, except maybe for the external OES sampler case. This is a not a complete fix, because it breaks the texture sharing extension for now. It allows us to proceed with building and integrating in the CI however. The rest will be handled in follow up patches. Change-Id: I96e128166e9bb5cd30809807dd0dccee1fe9be4c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-06-111-2/+2
| | | | | Change-Id: I77f35b1e27a0372d84b870bf50c2937fd67b3631 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* CMake: Make ThemeSupport an optional componentAlexandru Croitor2020-06-101-1/+8
| | | | | | | | | | | | | It became an optional component after the qtbase change 788cd98b357fdc9dd8b0f0b1baf1033f0efa1f11 So make it optional. This fixes top-level builds on macOS (and probably other platforms). Amends 09cb3a30900353dea710cf7d614087c0718dce52 Change-Id: I1012923997201673b628a0ee5e512df31228f4cc Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>