summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.4' in qt/qtwaylandQt Submodule Update Bot2022-06-081-2/+2
| | | | | Change-Id: I0b8f8f6de74e87f0fd0f0b93c523d0d3682feb36 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QtWaylandCompositor: includemocsLiang Qi2022-06-0140-0/+82
| | | | | | | Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: I2311465d5341fc5902981d80ab0a117dd2df002d Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWaylandCompositor: includemocs - qt6Liang Qi2022-06-014-0/+10
| | | | | | | Pick-to: 6.3 6.2 Task-number: QTBUG-103295 Change-Id: Ica578e313dfcea3ec9f2c426fab9d1b643286bb5 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWaylandClient: includemocs - qt6Liang Qi2022-06-011-0/+2
| | | | | | | Pick-to: 6.3 6.2 Task-number: QTBUG-103295 Change-Id: Ia4cb0df840b27e70f162e28d13bedd992c27cd83 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWaylandClient: includemocsLiang Qi2022-06-0118-0/+36
| | | | | | | Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: Ibac5e794c7d7f35d51d8d48110892c33a0b67c7a Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWaylandEglClientHwIntegrationPrivate: includemocsLiang Qi2022-06-011-0/+2
| | | | | | | Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: I27804dc4a26050931ff7d99aaee319d88b254b00 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWaylandCompositorQtShell: includemocsLiang Qi2022-06-013-0/+6
| | | | | | | Pick-to: 6.3 Task-number: QTBUG-103295 Change-Id: Ib8d24b06b22711b6fa6d3f6f15729cad7f3edd07 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWaylandTextureSharing: includemocsLiang Qi2022-06-012-0/+4
| | | | | | | Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: I8b26c642488928523effbf9be9ac05939067a493 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QWaylandXdgShellIntegrationPlugin: includemocs - qt6Liang Qi2022-06-011-0/+2
| | | | | | | Pick-to: 6.3 6.2 Task-number: QTBUG-103295 Change-Id: Iff8a76926a8a0b581a0290b5b6ab44453ac774ec Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QWaylandXdgShellIntegrationPlugin: includemocsLiang Qi2022-06-011-0/+2
| | | | | | | Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: I974dbcd67bc4a45cf18d0fdf197bcaeb12c633b4 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtWlShellIntegrationPrivate: includemocsLiang Qi2022-06-011-0/+2
| | | | | | | Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: I000dd8b5fa13747acfa8c12df4203dfdaa48b9c4 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Add missing QT_{BEGIN,END}_NAMESPACELiang Qi2022-06-013-0/+12
| | | | | | | | | Found by the includemoc script complaining. Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: I56513a331c098c1511b0b0091902f1e83f61e5c2 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Add a TU for qwaylandcompositorquickextensions_p.hLiang Qi2022-06-012-1/+37
| | | | | | | | | | | | Just to include the moc file. It's otherwise the only one left in mocs_compilation.cpp and we might want to introduce a warning later on if something ends up in there, to maintain the newly-established includemocs level. Pick-to: 6.3 6.2 Task-number: QTBUG-103295 Change-Id: Ic4dd94ab1a6ca20c4e0350066c875895841f4168 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Add a TU for qwaylandquickextension.hLiang Qi2022-06-012-1/+39
| | | | | | | | | | | | Just to include the moc file. It's otherwise the only one left in mocs_compilation.cpp and we might want to introduce a warning later on if something ends up in there, to maintain the newly-established includemocs level. Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-103295 Change-Id: Iafaf87d8624f0162acd1a3063b5c4fac83406194 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Client: fix mouse cursor restoring check when cursor enters the content areaIlya Fedin2022-06-011-1/+1
| | | | | | | | | | | | | | | In a32cc186e645e8dac6dd7089f374f6d20e924f39, windowContentGeometry was changed by adding shadow margins, but the check ensures that the point inside the content area rather than the decoration and windowContentGeometry is smaller than the decoration geometry now as it excludes the shadow. Creating the geometry from surfaceSize fixes it. Pick-to: 6.3 6.2 Change-Id: If20a387b6864c1bc961352654f827a45cee77bd1 Reviewed-by: Jan Grulich <jgrulich@redhat.com> Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-311-2/+2
| | | | | Change-Id: Ia0ec7213ffa6de2ef0810421c365973edeb424ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-271-2/+2
| | | | | Change-Id: Ief9ecb312e678395615b77bc92c421ed37bd2476 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-241-2/+2
| | | | | Change-Id: I4611776b6f8066a38fe1550cb676fc6700d439ea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* client: Avoid protocol error with invalid min/max sizeEskil Abrahamsen Blomfeldt2022-05-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the application sets an invalid minimum and maximum size (where the minimum is higher than the maximum), then we would blindly send this over the protocol, which is a protocol error according to the spec. Qt compositors will warn about this and ignore the size, but mainly because "but there's no matching error defined" according to the comment. Other compositors may close the connection when this happens. To avoid crashing the app based on bogus min/max size, we make sure we never send a maximum size which is less than the minimum size. This corresponds to the behavior of compositors which accept the size without raising an error: the minimum size takes precedence. Note that 0 means "no maximum size" in the protocol, so we cap the value before applying this logic. [ChangeLog][Client] Fixed an issue where setting an invalid minimum and maximum size on a window would cause some compositors to raise a protocol error. Pick-to: 6.2 6.3 Fixes: QTBUG-102626 Fixes: QTBUG-103391 Change-Id: I4004a4550a9fe3dae6a27169b4d1a9a616e21841 Reviewed-by: David Edmundson <davidedmundson@kde.org>
* CMake: use the --build-macro option to qtwaylandscannerThiago Macieira2022-05-192-4/+31
| | | | | | | | | So we get correct exports different from imports, which are required for GCC 12 with -mno-direct-extern-access and protected visibility. Change-Id: If05aeeb7176e4f13af9afffd16e856de1f4f68d6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qtwaylandscanner: add a way to use an build macro in the generated codeThiago Macieira2022-05-191-22/+27
| | | | | | Change-Id: If05aeeb7176e4f13af9afffd16e85611ff7c42f2 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 Bot2022-05-171-2/+2
| | | | | Change-Id: I234f8ef2335a2f0a18b6b71af1deeabb4212d630 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-161-2/+2
| | | | | Change-Id: I1154b817f31dc8ff7e0cf695c93fe12add50b293 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-121-2/+2
| | | | | Change-Id: I7c4ad2ae02412ce6c85fb3148317403f71fac4d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace QScopedPointer with std::unique_ptrThiago Macieira2022-05-116-14/+14
| | | | | | | | | | | | | As the warning asked. qwaylandshellintegrationfactory.cpp:67:28: warning: ‘T* QScopedPointer<T, Cleanup>::take() [with T = QtWaylandClient::QWaylandShellIntegration; Cleanup = QScopedPointerDeleter<QtWaylandClient::QWaylandShellIntegration>]’ is deprecated: Use std::unique_ptr instead, and call release(). [-Wdeprecated-declarations] As a drive-by, change *foo.get() to *foo. Pick-to: 6.3 6.2 Change-Id: I7fb65b80b7844c8d8f26fffd16e97fe161d6a67a Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-111-2/+2
| | | | | Change-Id: Ib907ca5585a08e12e47972914dbe625118dae6b3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* client: Mark return values as unused to suppress compiler warningsJanne Juntunen2022-05-112-2/+4
| | | | | | | | | | Return values of two write() functions were ignored, causing warnings which were treated as errors on webOS emulator build. Fixes: QTBUG-103378 Pick-to: 6.3 Change-Id: Ifc2e944dee376973b69220b7f75dc346c0a71e71 Reviewed-by: David Edmundson <davidedmundson@kde.org>
* compositor: Fix build without xkbcommonSamuli Piippo2022-05-101-1/+1
| | | | | | | | | | | This amends 4910b7adfa706520cd5180d5384b999488550aef. QWaylandKeyboardPrivate::resetKeyboardState() is behind an #if. We need to match the condition for the definition as well. Fixes: QTBUG-103341 Change-Id: Ib0b5b6284cac10a0cb5d53fca08e0d7226e7240a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* compositor: Fix build without xkbcommonEskil Abrahamsen Blomfeldt2022-05-101-0/+4
| | | | | | | | | | | This amends 4910b7adfa706520cd5180d5384b999488550aef. QWaylandKeyboardPrivate::resetKeyboardState() is behind an #if. We need to match the condition for the code that calls it. Fixes: QTBUG-103341 Change-Id: I6337a64870bb08930b0d19e03ca7fcc28e345493 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix: Access nullptr returned by QWaylandSurface::client()Roman Genkhel2022-05-101-1/+1
| | | | | | | | | surface()->client() could return null at the moment when QWaylandQuickItem::takeFocus invoked, which cause using nullptr Pick-to: 6.2 6.3 Change-Id: I89432882bd7117f45bac889bc85b2f86c77b21e8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Fix the build of wip-cpp-compositorLiang Qi2022-05-054-7/+14
| | | | | | | | | But it's still missing xdg_popup_grab() and xdg_popup_destroy() at least. Task-number: QTBUG-69937 Change-Id: I4f4b5ae6303da12be8d9b0f26da5098e3d0d6eea Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-041-2/+2
| | | | | Change-Id: I0671a0ec8ee590c7beaa5956051ad6ac490aa6e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Compositor: Re-enable touch events for Wayland clientsEskil Abrahamsen Blomfeldt2022-05-041-0/+1
| | | | | | | | | | | | | | | | | | | As documented, setAcceptTouchEvents() would be implicit in calling setAcceptedMouseButtons() in Qt 5, but in Qt 6, this was changed. The result was that QWaylandQuickItems would never receive any touch events in Qt 6, even though the touchEventsEnabled flag is set by default. To fix this, we add an explicit call to setAcceptTouchEvents() to ensure the same behavior as we had in Qt 5. [ChangeLog][QtWaylandCompositor] Fixed a bug where multi-touch would not work with Qt Wayland Compositor. Pick-to: 6.2 6.3 Fixes: QTBUG-102829 Change-Id: Idc99c56a7cc8651da844be3ea238b8537891dd1f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Clear keyboard modifier state when application deactivatesEskil Abrahamsen Blomfeldt2022-05-034-8/+53
| | | | | | | | | | | | | | | | | | | | | | When the application deactivates while a modifier is held down, the modifier would get stuck and be set for all subsequent shortcut events. This could easily happen when nesting a Wayland compositor inside another compositor and using ALT+TAB to switch to another application. The alt modifier would then get stuck, since it never received any release event. When the application is inactive and then comes back, we can't know which keys are pressed, so it's better to just assume they are all cleared at this point. [ChangeLog][QtWaylandCompositor] Fixed a bug where keyboard modifiers would get stuck if the compositor was running nested inside e.g. X11 and then ALT-TAB was used to switch to a different application. This would cause shortcuts to misbehave. Fixes: QTBUG-101862 Change-Id: I9645418719d8ef8fc2ce2203ca5b6a159f3d9a7c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Allow multiple client buffer integrations to initializeEskil Abrahamsen Blomfeldt2022-05-034-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | This amends 585f20dce37c398d8b2e6367008e3329dac79e24 where support for multiple client buffer integrations was added. Previously, this would not work unless you also set QT_WAYLAND_IGNORE_BIND_DISPLAY in the environment, because we would fail if eglBindWaylandDisplayWL() returned false, which it will when the display is already bound. Instead, we assume the display is correctly bound when the function returns false, and then we make sure we unbind from the same integration that originally did the bind. The patch adds unbind to the destructor of linux-dmabuf and eglstream integrations. This was previously missing. [ChangeLog][QtWaylandCompositor] Enabled support for multiple client buffer integrations without the need to set the QT_WAYLAND_IGNORE_BIND_DISPLAY environment variable. Fixes: QTBUG-101366 Change-Id: Iefeb865b540d96a55d3be9b9c1fb41bf388638ca Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-05-031-2/+2
| | | | | Change-Id: If137ba3dda29c7d36e90c35c7db7cdb4046e1666 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QtWaylandClient: use the CMake exports.h supportThiago Macieira2022-04-2862-88/+82
| | | | | | | | | | | | 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>
* doc: Add missing qml module landing pagesEskil Abrahamsen Blomfeldt2022-04-285-0/+103
| | | | | | | | | | When these are missing, external links to the contents of the modules break. Any \inqmlmodule should always have a corresponding \qmlmodule. Pick-to: 6.3 Fixes: QTBUG-102379 Change-Id: Id800e1ac3976957869f4a521f69f0190fb7eba5a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-04-281-2/+2
| | | | | Change-Id: I974648ef7e89374aa9d7b28ed66eaa9c453175de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix deprecated warningAllan Sandfeld Jensen2022-04-271-1/+1
| | | | | | | | | Use QMetaType instead of QVariant types Pick-to: 6.3 Change-Id: I92248cc5eff82c1dc20f7cad11bdeeccc64a5605 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Use QPlatformWindow's API as much as possible in QPATang Haixiang2022-04-201-5/+5
| | | | | | | | | | When using highdpi, window->geometry != platformwindow->geometry. In QPA we should use QPlatformWindow's API. Fixes: QTBUG-102601 Change-Id: Ib4ff2edbc045cf441cd2d594d502875417eb4917 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-04-191-2/+2
| | | | | Change-Id: Ia2ceb9aa634b68e1febcb94d4fbba63b93f1f8b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* use poll(2) when reading from clipboardKenneth Topp2022-04-141-7/+8
| | | | | | | | change clipboard read away from select(2) call which can fail when an application has large number of open files Change-Id: I6d98c6bb11cdd5b6171b01cfeb0044dd41cf9fb5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Fix QWaylandSurface::isOpaque property documentationTopi Reinio2022-04-061-1/+1
| | | | | | | | | | The \property command accepts no type, only the name of the property. Task-number: QTBUG-102185 Change-Id: Ia779a8c4097c7f4f1d1080b0e75114cea947578a Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: Fix documentation warnings and enable doc testing in CITopi Reinio2022-04-064-7/+14
| | | | | | | Pick-to: 6.3.0 6.3 Fixes: QTBUG-102185 Change-Id: Ib2f6da8d7af63ef89dba2701bda562722dd9a12f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* client: Synthesize enter/leave event for popup in xdg-shellLiang Qi2022-04-041-0/+27
| | | | | | | | | Fixes: QTBUG-100148 Pick-to: 6.3 6.2 5.15 Change-Id: I45e3156d7942cff9968674c0b253d15be7235921 Reviewed-by: Tang Haixiang <tanghaixiang@uniontech.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-04-011-2/+2
| | | | | Change-Id: I2a8955d8c3323d0ef6827b5ac7a6bc77b2febb83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix format of qt_attribution.json filesKai Köhne2022-03-311-3/+3
| | | | | | | | | | | Also fix a typo in the license name. Amends db3df0b3b439a Pick-to: 6.3.0 6.3 Fixes: QTBUG-102148 Change-Id: Ic231a4b744864c19190d428a9a2fc5101ffa77f0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2022-03-311-2/+2
| | | | | Change-Id: If385cf227e5a0243e71cadc00ba542f1e1b090b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix to have presentation feedback sequence timelyJungi Byun2022-03-312-3/+7
| | | | | | | | | | | | | | In the case connections in PresentationFeedback are QueuedConnection, there are sometimes a signal to be connected is emitted before creating another connection on the signal from the connection's slot method, and this makes wrong feedbacks. In order to send proper feedbacks to clients, create related connection earlier and make to work properly by checking some conditions. Pick-to: 6.3 Change-Id: Ic8f02139ca08713c419b0341b9a1e8add6f5a095 Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>