From 198368de4971c4a415dc256ee123677eda86cc1c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Nov 2022 06:51:14 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I1973e639ca97c1b3671f0983bfb2f204cfe3a1b0 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 784b371b9..7a8902e14 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: bfb87f1940ce7ee980db83876bd37a98d4820382 + ref: 2b54eb699a8cee6b0e3ea0bce90cf61d1f5cb92b required: true ../tqtc-qtdeclarative: - ref: 69fa64eb2417771e062bbebd399e43b735c2617b + ref: e2181524ffdc80f7c2da45c6408182ee7649ccf8 required: false -- cgit v1.2.3 From 4015d0cdacec995982c94c06daf6bd2f72254b62 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 22 Nov 2022 20:58:22 +0200 Subject: Client: Honor QGuiApplication::overrideCursor() If there's a QGuiApplication::overrideCursor(), QWindow::cursor() can still return a different cursor. This can result in a wrong cursor when the pointer enters a window. Fixes: QTBUG-75919 Change-Id: I015117b4b6d252b421ab14bd8f2a8f582f7cae52 Reviewed-by: Liang Qi (cherry picked from commit 471b2123400ef6936b5173553205549c7dd1a249) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylandwindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index ef5070efe..2c133f93f 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -1215,7 +1215,10 @@ void QWaylandWindow::setMouseCursor(QWaylandInputDevice *device, const QCursor & void QWaylandWindow::restoreMouseCursor(QWaylandInputDevice *device) { - setMouseCursor(device, window()->cursor()); + if (const QCursor *overrideCursor = QGuiApplication::overrideCursor()) + setMouseCursor(device, *overrideCursor); + else + setMouseCursor(device, window()->cursor()); } #endif -- cgit v1.2.3 From 869b99e19331094ed2388e7a3c47fd2797c2714d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Dec 2022 21:37:49 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: If5201fbaf809ff6b1780419edf49ef1b0f604036 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 7a8902e14..4c1709642 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 2b54eb699a8cee6b0e3ea0bce90cf61d1f5cb92b + ref: b76baec7e675abc7ccaf910900acd74f231d0edb required: true ../tqtc-qtdeclarative: - ref: e2181524ffdc80f7c2da45c6408182ee7649ccf8 + ref: 2d698f4ccf303777bfd777f9b20ccad2f8bd932f required: false -- cgit v1.2.3 From d44f4b105659e1703bab8cbe6eca0aa41e4ecb9c Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 7 Dec 2022 16:55:06 +0200 Subject: Bump version to 6.2.8 Change-Id: I984f4047802249bd98323f991049689bd7ca9699 Reviewed-by: Tarja Sundqvist --- .cmake.conf | 2 +- .qmake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cmake.conf b/.cmake.conf index 07d90b8ad..e62fae5ef 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 707d1b056..eefb4b69e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.7 +MODULE_VERSION = 6.2.8 -- cgit v1.2.3 From 6f93276b1ea24d58c70fad9560a7b29997c3f696 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Dec 2022 21:03:19 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I5bf3102c1e6ed9fa3e8ebcf56d763053c8ddbeda Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 4c1709642..5cfe0dd2e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: b76baec7e675abc7ccaf910900acd74f231d0edb + ref: 6aa01cf2fbbc713aa2640e54edb93af5ef18605e required: true ../tqtc-qtdeclarative: - ref: 2d698f4ccf303777bfd777f9b20ccad2f8bd932f + ref: d0c4361d43b27311d5f64e1160027fd115799f62 required: false -- cgit v1.2.3 From 7a968189c36e234043897e23abcf76df1226d1e3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Dec 2022 07:15:49 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: Idb13a1fbf91acbbcb9ecdef09da90898a1a70a92 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 5cfe0dd2e..cc22866b0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 6aa01cf2fbbc713aa2640e54edb93af5ef18605e + ref: ff523a0e3edafa927c9d13e605d0b007e4fc3a16 required: true ../tqtc-qtdeclarative: - ref: d0c4361d43b27311d5f64e1160027fd115799f62 + ref: 0cd389251201abb6b762e288b9929dfff9464f79 required: false -- cgit v1.2.3 From 979812d25d21f113a23479519734184e68da3bca Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Dec 2022 07:13:42 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I91720c6047d2f435df71bd5b37df65eee4ab90c6 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index cc22866b0..2d0221d41 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: ff523a0e3edafa927c9d13e605d0b007e4fc3a16 + ref: 366bc6cd08e09bcd9fac78b6efc839f641669834 required: true ../tqtc-qtdeclarative: - ref: 0cd389251201abb6b762e288b9929dfff9464f79 + ref: 7e7f24a8b7c7ce12d35312480c09cbe404dbfe8b required: false -- cgit v1.2.3 From 11ae979ac4c016b4c58a4a1e5592e025a030feef Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Dec 2022 07:01:04 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I282c02e1b3ba32af0adde5a76534bea1d6ee5bc7 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 2d0221d41..46b43bb76 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 366bc6cd08e09bcd9fac78b6efc839f641669834 + ref: c381d4b124b6dd8bb800402817750436cba06ee9 required: true ../tqtc-qtdeclarative: - ref: 7e7f24a8b7c7ce12d35312480c09cbe404dbfe8b + ref: 10095014d175dae1843a5833d4499e880387f843 required: false -- cgit v1.2.3 From a6cde218382d7fef4cc4a1e380b8059c486778e9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Dec 2022 06:58:45 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I2f284aea8244e781ff81af19140af12209ec579d Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 46b43bb76..4cb6fe8ec 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: c381d4b124b6dd8bb800402817750436cba06ee9 + ref: 51159e144cf83c8ac7decbc270c091d8a717fd53 required: true ../tqtc-qtdeclarative: - ref: 10095014d175dae1843a5833d4499e880387f843 + ref: 38e2430391ea64b1de7f9f083c5958a3fbd6d012 required: false -- cgit v1.2.3 From 5e7bf2d9fcb0d47014248d7dfbfc6eac0f1c1b63 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Jan 2023 15:11:26 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: If29ab8fe889a84c5a284beb276cb538cc26eaa4c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 4cb6fe8ec..e352bc909 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 51159e144cf83c8ac7decbc270c091d8a717fd53 + ref: 922089759d6b761e07d71a5f30991bb971d7fea0 required: true ../tqtc-qtdeclarative: - ref: 38e2430391ea64b1de7f9f083c5958a3fbd6d012 + ref: f3a153c361c1c5ac0ade8a84bd513f5dbe0eac50 required: false -- cgit v1.2.3 From 92e35edc81cebc61e5f9f4bd7bd111120cad9d26 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Jan 2023 01:41:09 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I0a4ade3bb565299dfef9252673daee97cb8546f8 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index e352bc909..97406d701 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 922089759d6b761e07d71a5f30991bb971d7fea0 + ref: 3eb6b13c0b30263c6c4d17e1b8c4e5a2cbc73b9e required: true ../tqtc-qtdeclarative: - ref: f3a153c361c1c5ac0ade8a84bd513f5dbe0eac50 + ref: 0a01bd32762f240d44230cebfc8b0913de57f49a required: false -- cgit v1.2.3 From 56104817364afb36eb1c5e4199beb71e61ec2cd4 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 25 Jan 2023 17:07:07 +0400 Subject: Don't change process locale while initializing QWaylandInputContext This was overriding the locale previously set in QCoreApplicationPrivate::initLocale and can switch the process to non-UTF8 codepage Change-Id: I5cd6664d1a7c315019d6c798b33b9deb33982a59 Reviewed-by: Thiago Macieira (cherry picked from commit a3896c8a036c6a9b19d889c212769d72e70257c4) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylandinputcontext.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index 4420bb189..db897be9a 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -591,9 +591,7 @@ void QWaylandInputContext::ensureInitialized() } m_initialized = true; - const char *locale = setlocale(LC_CTYPE, ""); - if (!locale) - locale = setlocale(LC_CTYPE, nullptr); + const char *const locale = setlocale(LC_CTYPE, nullptr); qCDebug(qLcQpaInputMethods) << "detected locale (LC_CTYPE):" << locale; m_composeTable = xkb_compose_table_new_from_locale(m_XkbContext, locale, XKB_COMPOSE_COMPILE_NO_FLAGS); -- cgit v1.2.3 From 121e6dbb389c75a22b4cc928edb20c32f0e19917 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Jan 2023 14:09:10 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: Ifd2170e6f42353acb9a088ebf31a959a02635bf9 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 97406d701..fc03d9e25 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,5 +3,5 @@ dependencies: ref: 3eb6b13c0b30263c6c4d17e1b8c4e5a2cbc73b9e required: true ../tqtc-qtdeclarative: - ref: 0a01bd32762f240d44230cebfc8b0913de57f49a + ref: a6b0fa3945144171e656f62eeb9d5e4aa7bc9a11 required: false -- cgit v1.2.3 From 1340bd478ad51822cd79abcffec34d36aef3bc81 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 31 Jan 2023 21:31:51 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I731acc5cb4f5b1b1d7eb9e9c9106872e39935a02 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index fc03d9e25..c89ceb6c5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 3eb6b13c0b30263c6c4d17e1b8c4e5a2cbc73b9e + ref: b722b25100808319215cb9e875e622242b42695d required: true ../tqtc-qtdeclarative: - ref: a6b0fa3945144171e656f62eeb9d5e4aa7bc9a11 + ref: d5b6f586f490414df87d5b65ab1a441e211a8972 required: false -- cgit v1.2.3 From 537e9c087259b66213b8265466a9a15a924c9ca2 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 12 Jan 2023 14:56:18 +0100 Subject: client: Fix infinite recursion with text-input-v2 It was possible to get into an infinite recursion when double-clicking an entry in an item view to edit it. What would happen is that the editor takes focus, and we call commit on the input method commit in case the previous focused widget has pending input that needs to be committed. The subsequent method event then causes the QAbstractItemView to set focus, and since we have not yet updated the focus in the previous call, we end up in an infinite recursion, eventually crashing when the stack overflows. As a guard for this, we only send an input method event when there is actually pre-edit text to commit, and we reset the pre-edit text immediately so that any subsequent call will just exit. [ChangeLog][QtWaylandClient] Fixed a possible crash when editing a field in an item view. Fixes: QTBUG-109302 Change-Id: I45237c80e53b1386705279899e19319180d78fa1 Reviewed-by: Liang Qi Reviewed-by: Paul Olav Tvete Reviewed-by: Inho Lee (cherry picked from commit db4afd9caf037cfff7aca8b130d326c340b7fed0) --- src/client/qwaylandinputcontext.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index db897be9a..b5dcdcd5c 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -93,9 +93,12 @@ void QWaylandTextInput::reset() void QWaylandTextInput::commit() { if (QObject *o = QGuiApplication::focusObject()) { - QInputMethodEvent event; - event.setCommitString(m_preeditCommit); - QCoreApplication::sendEvent(o, &event); + if (!m_preeditCommit.isEmpty()) { + QInputMethodEvent event; + event.setCommitString(m_preeditCommit); + m_preeditCommit = QString(); + QCoreApplication::sendEvent(o, &event); + } } reset(); -- cgit v1.2.3 From 1a8af0637abac1701c425f1564df69f858e0f1fc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 3 Feb 2023 07:11:46 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: Ie226dd49a7e28424f061b7bc1df388d6fba1230c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c89ceb6c5..c336be836 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: b722b25100808319215cb9e875e622242b42695d + ref: 4c7176aeb4d759ef408d4a59a0a7f82295bfb41c required: true ../tqtc-qtdeclarative: - ref: d5b6f586f490414df87d5b65ab1a441e211a8972 + ref: 6ceabf0467f852666deb2e02533fe7687ffaef50 required: false -- cgit v1.2.3 From c1265d9b50d1e15d5ef5780dcf79ed9d2e5a8dc3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 Feb 2023 16:07:07 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I14716c7af3f53f5b7eeb8a03dda5bd052f6ae241 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c336be836..783af207b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 4c7176aeb4d759ef408d4a59a0a7f82295bfb41c + ref: 980a3f3c82cfcb2bec78fb3b0b6095a63b64784f required: true ../tqtc-qtdeclarative: - ref: 6ceabf0467f852666deb2e02533fe7687ffaef50 + ref: e5cfb56022281e38673b8910915a89395980c449 required: false -- cgit v1.2.3 From 5c18fc9ec31bac8ae5431b04473837b8023ff8b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Feb 2023 06:43:46 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I5570b972cee850483579e62622d922efad9a057f Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 783af207b..00152fdb5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 980a3f3c82cfcb2bec78fb3b0b6095a63b64784f + ref: a9962aaaba87eb1344c0eb9cbfc944c8882473c2 required: true ../tqtc-qtdeclarative: - ref: e5cfb56022281e38673b8910915a89395980c449 + ref: 176e6eb8357535d19d3ca079c71b96915c1bef9c required: false -- cgit v1.2.3 From 7254df5fb2dbfd0cfc509c283ecb72bab59ae600 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Feb 2023 07:19:02 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: Ib99067e60cbd0027d5ecdd2b6aabf34c82f6b8b4 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 00152fdb5..11e7a761e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: a9962aaaba87eb1344c0eb9cbfc944c8882473c2 + ref: c581474dfbfcb517573d8870cbbdc53f579e09cc required: true ../tqtc-qtdeclarative: - ref: 176e6eb8357535d19d3ca079c71b96915c1bef9c + ref: a619c76c2c141accf37bb3478718d9b48c6833f0 required: false -- cgit v1.2.3 From bc3b137937fb722f2a15f6cbed187756009796b9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Feb 2023 14:51:26 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: Ic54b42b93d0f03adbe755d739df48921aaf5f3cf Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 11e7a761e..bea3a9118 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: c581474dfbfcb517573d8870cbbdc53f579e09cc + ref: 9ac6224081621845bda9f5348d047cb9f65c43fb required: true ../tqtc-qtdeclarative: - ref: a619c76c2c141accf37bb3478718d9b48c6833f0 + ref: b20b2831bd81aff74e0dc4b664d6df9abb0f4eed required: false -- cgit v1.2.3 From 4f8aa5ceaa8baa3bdbb0f1483589261094c07dde Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Feb 2023 07:09:21 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I213f66e70bd2d00ac7475705fcad91f3279d49cd Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index bea3a9118..9d05b98a8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 9ac6224081621845bda9f5348d047cb9f65c43fb + ref: d9feaffdfbbd9c3b795e31cd141c842a52ba8124 required: true ../tqtc-qtdeclarative: - ref: b20b2831bd81aff74e0dc4b664d6df9abb0f4eed + ref: 7f04b610cb2c7214e5aba8a1709481dc4c8b306f required: false -- cgit v1.2.3 From 8586ab978d61161f66c3af4ee88022de9e92ff9e Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 12 Jan 2023 14:49:25 +0200 Subject: Client: Remove flip popup constraints xdg_positioner doesn't have good anchor rect and other needed information so the compositor can properly flip popups. In some windows I see that some popups are flipped in such a way that the popups look "detached" from the parent window. With the information that QtWayland provides so far only slide constraint adjustments can produce somewhat expected results. Although there will be still some issues near screen edges. Task-number: QTBUG-87303 Change-Id: I4021f497b78e62651fe606c4be21a387a92edd6c Reviewed-by: Liang Qi (cherry picked from commit d7a5dab0182cba19d7f59e542672aa3d1b2e859e) Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp index c49ab6d83..2e03da572 100644 --- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp @@ -450,9 +450,7 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent) positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right); positioner->set_size(m_window->geometry().width(), m_window->geometry().height()); positioner->set_constraint_adjustment(QtWayland::xdg_positioner::constraint_adjustment_slide_x - | QtWayland::xdg_positioner::constraint_adjustment_slide_y - | QtWayland::xdg_positioner::constraint_adjustment_flip_x - | QtWayland::xdg_positioner::constraint_adjustment_flip_y); + | QtWayland::xdg_positioner::constraint_adjustment_slide_y); m_popup = new Popup(this, parentXdgSurface, positioner); positioner->destroy(); delete positioner; -- cgit v1.2.3 From 93ea6555c8d2e1d05fb8dcbd8838bfefd56ae03a Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 6 Mar 2023 01:11:45 +0100 Subject: client: Do not cast placeholder screens to QWaylandScreen It's wrong to C-cast an object to a class that isn't theirs. Check if it is a placeholder first. Change-Id: I45d3c423422ae6638a033fb0f4cfefc7cd4460f0 Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: David Edmundson (cherry picked from commit a53f022393a1276dbf8eccbae04cb0bd6cea0160) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylandnativeinterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp index 2b26f4da7..2b0f19e67 100644 --- a/src/client/qwaylandnativeinterface.cpp +++ b/src/client/qwaylandnativeinterface.cpp @@ -137,7 +137,7 @@ void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourc { QByteArray lowerCaseResource = resourceString.toLower(); - if (lowerCaseResource == "output") + if (lowerCaseResource == "output" && !screen->handle()->isPlaceholder()) return ((QWaylandScreen *) screen->handle())->output(); return nullptr; -- cgit v1.2.3 From a55502e4c8a7248d911d326fc856faca9e05833f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Mar 2023 10:27:40 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I3712e52e09ae760f570cd141ca52b8f26861477c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 9d05b98a8..6b2e7e5bb 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: d9feaffdfbbd9c3b795e31cd141c842a52ba8124 + ref: 2e46273e26b9e0bed69f766c77e93b86cf72dcd6 required: true ../tqtc-qtdeclarative: - ref: 7f04b610cb2c7214e5aba8a1709481dc4c8b306f + ref: cb0341c1b0797c91cc6d54cb997ce556cc927e4c required: false -- cgit v1.2.3 From 51bc755aaaeab613e38044d6b354975694347a30 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 13 Mar 2023 06:45:47 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I11322e5d38547e844fef995729e8d5b9cedfdef7 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 6b2e7e5bb..58d27005f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 2e46273e26b9e0bed69f766c77e93b86cf72dcd6 + ref: 9b1944d24a5a76826b4929e09f2b470120b795f2 required: true ../tqtc-qtdeclarative: - ref: cb0341c1b0797c91cc6d54cb997ce556cc927e4c + ref: 9b821b49cef736e14722f8473bc23dda1e0d58e0 required: false -- cgit v1.2.3 From 3c51b2bf2514fb7ab8c1c6e6c2c747d85247f16d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Mar 2023 16:54:36 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I85b186af25b2949e743f2e4b457fc66b30f848df Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 58d27005f..399843be9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 9b1944d24a5a76826b4929e09f2b470120b795f2 + ref: 3282d501ef493890c8cdc5d8c27dd8cb187a0077 required: true ../tqtc-qtdeclarative: - ref: 9b821b49cef736e14722f8473bc23dda1e0d58e0 + ref: e86f1d1c0d10c907ce4463089682c88aec35c66a required: false -- cgit v1.2.3 From c3adb5647835bc97ebe9023481bde5a4b9e17127 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 19 Mar 2023 10:20:11 +0400 Subject: Client: Fix the mouse being stuck in pressed state after DnD I can still reproduce the problem using QtWidgets applications on KDE Plasma 5.27. Both Windows and macOS QPA have a similar quirk and they both send a MouseButtonRelease event rather than a MouseMove event. Amends f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba Task-number: QTBUG-97037 Change-Id: I864a1cb68b3660d858623f943b3958f7cafbf955 Reviewed-by: David Edmundson (cherry picked from commit e3c74961b1c7415fd94678802ad7f8173d0be4c1) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylandinputdevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index 825eeb1f9..c907a1081 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -892,7 +892,7 @@ void QWaylandInputDevice::Pointer::releaseButtons() mButtons = Qt::NoButton; if (auto *window = focusWindow()) { - MotionEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers()); + ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers()); window->handleMouse(mParent, e); } } -- cgit v1.2.3 From 5cac047829926227c2f5680b92ab78393419f8eb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Mar 2023 07:55:54 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I95d30b2bc9eaa7bba23bd9b7ecdde88d30a7448a Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 399843be9..8be53d6d3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 3282d501ef493890c8cdc5d8c27dd8cb187a0077 + ref: caf0a9c0bd3620979a34b454a4ccffa9d60db886 required: true ../tqtc-qtdeclarative: - ref: e86f1d1c0d10c907ce4463089682c88aec35c66a + ref: 8cbb9c512fd17388833b1b77835e7c3991307e30 required: false -- cgit v1.2.3 From 5e64f7d9adbe5e7120c937087de9f8de07537f6b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Mar 2023 07:05:54 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I57ac82bb6fc9569f91c814e2ed3e6a5b708dfbbc Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8be53d6d3..f70f225c6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: caf0a9c0bd3620979a34b454a4ccffa9d60db886 + ref: d2d42d45a71b6ae10d0c7459dcb69a7e7d6295b9 required: true ../tqtc-qtdeclarative: - ref: 8cbb9c512fd17388833b1b77835e7c3991307e30 + ref: b2b288680ab2bd5a59dd744a5bf17813c7aa6a4b required: false -- cgit v1.2.3 From 676a776e15f36f069debcc27b584f48e583ee7cb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Mar 2023 07:10:20 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtwayland Change-Id: I21379057b68e4401057d4c0b8cfc44479224a240 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index f70f225c6..e17b5113a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: d2d42d45a71b6ae10d0c7459dcb69a7e7d6295b9 + ref: ca128e25119c0b259d083567c796bfa67b100a42 required: true ../tqtc-qtdeclarative: - ref: b2b288680ab2bd5a59dd744a5bf17813c7aa6a4b + ref: a7df6331b29e44ed364fcd7297c4e1bc6ce2167c required: false -- cgit v1.2.3