Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl

Change-Id: Id97943831fbc85d703dc50369e0d975513208c43

6 files changed, 34 insertions, 32 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 7c9136780..e95d63bc6 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -4,4 +4,4 @@ DEFINES += QT_NO_FOREACH
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 DEFINES += QT_NO_LINKED_LIST
 
-MODULE_VERSION = 5.15.7
+MODULE_VERSION = 5.15.8
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index 8b79c08f8..84a346746 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -387,8 +387,10 @@ void QWaylandTextInput::zwp_text_input_v2_input_method_changed(uint32_t serial,
 Qt::KeyboardModifiers QWaylandTextInput::modifiersToQtModifiers(uint32_t modifiers)
 {
     Qt::KeyboardModifiers ret = Qt::NoModifier;
-    for (int i = 0; modifiers >>= 1; ++i) {
-        ret |= m_modifiersMap[i];
+    for (int i = 0; i < m_modifiersMap.size(); ++i) {
+        if (modifiers & (1 << i)) {
+            ret |= m_modifiersMap[i];
+        }
     }
     return ret;
 }
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index afdebf55e..cb82857ac 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -821,7 +821,7 @@ bool QWaylandWindow::createDecoration()
         decoration = false;
     if (mSubSurfaceWindow)
         decoration = false;
-    if (mShellSurface && !mShellSurface->wantsDecorations())
+    if (!mShellSurface || !mShellSurface->wantsDecorations())
         decoration = false;
 
     bool hadDecoration = mWindowDecoration;
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index 3a1569f7f..f3e3c330a 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -335,15 +335,16 @@ bool QWaylandXdgSurface::handleExpose(const QRegion &region)
 
 void QWaylandXdgSurface::applyConfigure()
 {
-    Q_ASSERT(m_pendingConfigureSerial != 0);
+    // It is a redundant ack_configure, so skipped.
+    if (m_pendingConfigureSerial == m_appliedConfigureSerial)
+        return;
 
     if (m_toplevel)
         m_toplevel->applyConfigure();
+    m_appliedConfigureSerial = m_pendingConfigureSerial;
 
     m_configured = true;
-    ack_configure(m_pendingConfigureSerial);
-
-    m_pendingConfigureSerial = 0;
+    ack_configure(m_appliedConfigureSerial);
 }
 
 bool QWaylandXdgSurface::wantsDecorations() const
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
index 0c98be35c..96785205f 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
@@ -153,6 +153,7 @@ private:
     bool m_configured = false;
     QRegion m_exposeRegion;
     uint m_pendingConfigureSerial = 0;
+    uint m_appliedConfigureSerial = 0;
 
     friend class QWaylandXdgShell;
 };
diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
index 2e17bef87..b92c3dbea 100644
--- a/tests/auto/client/seatv4/tst_seatv4.cpp
+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
@@ -135,19 +135,19 @@ void tst_seatv4::setsCursorOnEnter()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
 }
 
 void tst_seatv4::usesEnterSerial()
 {
-    QSignalSpy setCursorSpy(exec([=] { return pointer(); }), &Pointer::setCursor);
+    QSignalSpy setCursorSpy(exec([&] { return pointer(); }), &Pointer::setCursor);
     QRasterWindow window;
     window.resize(64, 64);
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    uint enterSerial = exec([=] {
+    uint enterSerial = exec([&] {
         return pointer()->sendEnter(xdgSurface()->m_surface, {32, 32});
     });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
@@ -158,7 +158,7 @@ void tst_seatv4::usesEnterSerial()
 
 void tst_seatv4::focusDestruction()
 {
-    QSignalSpy setCursorSpy(exec([=] { return pointer(); }), &Pointer::setCursor);
+    QSignalSpy setCursorSpy(exec([&] { return pointer(); }), &Pointer::setCursor);
     QRasterWindow window;
     window.resize(64, 64);
     window.show();
@@ -166,7 +166,7 @@ void tst_seatv4::focusDestruction()
     // Setting a cursor now is not allowed since there has been no enter event
     QCOMPARE(setCursorSpy.count(), 0);
 
-    uint enterSerial = exec([=] {
+    uint enterSerial = exec([&] {
         return pointer()->sendEnter(xdgSurface()->m_surface, {32, 32});
     });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
@@ -287,8 +287,6 @@ void tst_seatv4::simpleAxis()
         }
         struct Event // Because I didn't find a convenient way to copy it entirely
         {
-            Event() = default;
-
             const QPoint pixelDelta;
             const QPoint angleDelta; // eights of a degree, positive is upwards, left
         };
@@ -298,7 +296,7 @@ void tst_seatv4::simpleAxis()
     WheelWindow window;
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] {
+    exec([&] {
         Surface *surface = xdgSurface()->m_surface;
         pointer()->sendEnter(surface, {32, 32});
         wl_client *client = surface->resource()->client();
@@ -322,7 +320,7 @@ void tst_seatv4::invalidPointerEvents()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] {
+    exec([&] {
         auto *p = pointer();
         auto *c = client();
         // Purposefully send events without a wl_pointer.enter
@@ -355,7 +353,7 @@ static bool supportsCursorSizes(const QVector<uint> &sizes)
 {
     auto *waylandIntegration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
     wl_shm *shm = waylandIntegration->display()->shm()->object();
-    return std::all_of(sizes.begin(), sizes.end(), [=](uint size) {
+    return std::all_of(sizes.begin(), sizes.end(), [&](uint size) {
         return supportsCursorSize(size, shm);
     });
 }
@@ -384,15 +382,15 @@ void tst_seatv4::scaledCursor()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
     QCOMPOSITOR_TRY_VERIFY(cursorSurface()->m_committed.buffer);
     QCOMPOSITOR_TRY_COMPARE(cursorSurface()->m_committed.bufferScale, 1);
-    QSize unscaledPixelSize = exec([=] {
+    QSize unscaledPixelSize = exec([&] {
         return cursorSurface()->m_committed.buffer->size();
     });
 
-    exec([=] {
+    exec([&] {
         auto *surface = cursorSurface();
         surface->sendEnter(getAll<Output>()[1]);
         surface->sendLeave(getAll<Output>()[0]);
@@ -412,7 +410,7 @@ void tst_seatv4::unscaledFallbackCursor()
 
     const int screens = 4; // with scales 1, 2, 4, 8
 
-    exec([=] {
+    exec([&] {
         for (int i = 1; i < screens; ++i) {
             OutputData d;
             d.scale = int(qPow(2, i));
@@ -425,11 +423,11 @@ void tst_seatv4::unscaledFallbackCursor()
     window.resize(64, 64);
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
     QCOMPOSITOR_TRY_VERIFY(cursorSurface()->m_committed.buffer);
     QCOMPOSITOR_TRY_COMPARE(cursorSurface()->m_committed.bufferScale, 1);
-    QSize unscaledPixelSize = exec([=] {
+    QSize unscaledPixelSize = exec([&] {
         return cursorSurface()->m_committed.buffer->size();
     });
 
@@ -437,7 +435,7 @@ void tst_seatv4::unscaledFallbackCursor()
     QCOMPARE(unscaledPixelSize.height(), int(defaultSize));
 
     for (int i = 1; i < screens; ++i) {
-        exec([=] {
+        exec([&] {
             auto *surface = cursorSurface();
             surface->sendEnter(getAll<Output>()[i]);
             surface->sendLeave(getAll<Output>()[i-1]);
@@ -475,14 +473,14 @@ void tst_seatv4::bitmapCursor()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
     QCOMPOSITOR_TRY_VERIFY(cursorSurface()->m_committed.buffer);
     QCOMPOSITOR_COMPARE(cursorSurface()->m_committed.buffer->size(), QSize(24, 24));
     QCOMPOSITOR_COMPARE(cursorSurface()->m_committed.bufferScale, 1);
     QCOMPOSITOR_COMPARE(pointer()->m_hotspot, QPoint(12, 12));
 
-    exec([=] {
+    exec([&] {
         auto *surface = cursorSurface();
         surface->sendEnter(getAll<Output>()[1]);
         surface->sendLeave(getAll<Output>()[0]);
@@ -521,14 +519,14 @@ void tst_seatv4::hidpiBitmapCursor()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
     QCOMPOSITOR_TRY_VERIFY(cursorSurface()->m_committed.buffer);
     QCOMPOSITOR_COMPARE(cursorSurface()->m_committed.buffer->size(), QSize(48, 48));
     QCOMPOSITOR_COMPARE(cursorSurface()->m_committed.bufferScale, 2);
     QCOMPOSITOR_COMPARE(pointer()->m_hotspot, QPoint(12, 12));
 
-    exec([=] {
+    exec([&] {
         auto *surface = cursorSurface();
         surface->sendEnter(getAll<Output>()[1]);
         surface->sendLeave(getAll<Output>()[0]);
@@ -558,7 +556,7 @@ void tst_seatv4::hidpiBitmapCursorNonInt()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
     QCOMPOSITOR_TRY_VERIFY(cursorSurface()->m_committed.buffer);
     QCOMPOSITOR_COMPARE(cursorSurface()->m_committed.buffer->size(), QSize(100, 100));
@@ -576,12 +574,12 @@ void tst_seatv4::animatedCursor()
     window.show();
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
 
-    exec([=] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
+    exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); });
     QCOMPOSITOR_TRY_VERIFY(cursorSurface());
 
     // We should get the first buffer without waiting for a frame callback
     QCOMPOSITOR_TRY_VERIFY(cursorSurface()->m_committed.buffer);
-    QSignalSpy bufferSpy(exec([=] { return cursorSurface(); }), &Surface::bufferCommitted);
+    QSignalSpy bufferSpy(exec([&] { return cursorSurface(); }), &Surface::bufferCommitted);
 
     exec([&] {
         // Make sure no extra buffers have arrived