Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp

Change-Id: I42733f5ad9429a5d2ff6c804eb1f3f2d50f50811

10 files changed, 74 insertions, 7 deletions

diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index e19acff7c..499a93a1d 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -515,7 +515,8 @@ void tst_WaylandClient::longWindowTitleWithUtf16Characters()
 
 int main(int argc, char **argv)
 {
-    setenv("XDG_RUNTIME_DIR", ".", 1);
+    QTemporaryDir tmpRuntimeDir;
+    setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1);
     setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin
 
     MockCompositor compositor;
diff --git a/tests/auto/client/datadevicev1/tst_datadevicev1.cpp b/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
index e3babceb5..1568b3b96 100644
--- a/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
+++ b/tests/auto/client/datadevicev1/tst_datadevicev1.cpp
@@ -59,6 +59,7 @@ private slots:
     void pasteUtf8();
     void destroysPreviousSelection();
     void destroysSelectionWithSurface();
+    void destroysSelectionOnLeave();
     void dragWithoutFocus();
 };
 
@@ -215,6 +216,35 @@ void tst_datadevicev1::destroysSelectionWithSurface()
     QCOMPOSITOR_TRY_COMPARE(dataDevice()->m_sentSelectionOffers.size(), 0);
 }
 
+void tst_datadevicev1::destroysSelectionOnLeave()
+{
+    QRasterWindow window;
+    window.resize(64, 64);
+    window.show();
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+
+    exec([&] {
+        auto *offer = dataDevice()->sendDataOffer(client(), {"text/plain"});
+        dataDevice()->sendSelection(offer);
+
+        auto *surface = xdgSurface()->m_surface;
+        keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol
+    });
+
+    QTRY_VERIFY(QGuiApplication::clipboard()->mimeData(QClipboard::Clipboard));
+    QTRY_VERIFY(QGuiApplication::clipboard()->mimeData(QClipboard::Clipboard)->hasText());
+
+    QSignalSpy dataChangedSpy(QGuiApplication::clipboard(), &QClipboard::dataChanged);
+
+    exec([&] {
+        auto *surface = xdgSurface()->m_surface;
+        keyboard()->sendLeave(surface);
+    });
+
+    QTRY_COMPARE(dataChangedSpy.count(), 1);
+    QVERIFY(!QGuiApplication::clipboard()->mimeData(QClipboard::Clipboard)->hasText());
+}
+
 // The application should not crash if it attempts to start a drag operation
 // when it doesn't have input focus (QTBUG-76368)
 void tst_datadevicev1::dragWithoutFocus()
diff --git a/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp b/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp
index f93d9fbc5..55158474c 100644
--- a/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp
+++ b/tests/auto/client/fullscreenshellv1/tst_fullscreenshellv1.cpp
@@ -93,7 +93,8 @@ void tst_WaylandClientFullScreenShellV1::createDestroyWindow()
 
 int main(int argc, char **argv)
 {
-    setenv("XDG_RUNTIME_DIR", ".", 1);
+    QTemporaryDir tmpRuntimeDir;
+    setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1);
     setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin
     setenv("QT_WAYLAND_SHELL_INTEGRATION", "fullscreen-shell-v1", 1);
     setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); // window decorations don't make much sense here
diff --git a/tests/auto/client/inputcontext/tst_inputcontext.cpp b/tests/auto/client/inputcontext/tst_inputcontext.cpp
index 7c0132e35..1f07eb520 100644
--- a/tests/auto/client/inputcontext/tst_inputcontext.cpp
+++ b/tests/auto/client/inputcontext/tst_inputcontext.cpp
@@ -171,7 +171,8 @@ void tst_inputcontext::inputContextReconfigurationWhenTogglingTextInputExtension
 
 int main(int argc, char *argv[])
 {
-    qputenv("XDG_RUNTIME_DIR", ".");
+    QTemporaryDir tmpRuntimeDir;
+    qputenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit());
     qputenv("QT_QPA_PLATFORM", "wayland");
 
     tst_inputcontext tc;
diff --git a/tests/auto/client/iviapplication/tst_iviapplication.cpp b/tests/auto/client/iviapplication/tst_iviapplication.cpp
index 59ff6f555..8d6ea6484 100644
--- a/tests/auto/client/iviapplication/tst_iviapplication.cpp
+++ b/tests/auto/client/iviapplication/tst_iviapplication.cpp
@@ -124,7 +124,8 @@ void tst_WaylandClientIviApplication::uniqueIviIds()
 
 int main(int argc, char **argv)
 {
-    setenv("XDG_RUNTIME_DIR", ".", 1);
+    QTemporaryDir tmpRuntimeDir;
+    setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1);
     setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin
     setenv("QT_WAYLAND_SHELL_INTEGRATION", "ivi-shell", 1);
     setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); // window decorations don't make much sense on ivi-application
diff --git a/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp b/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp
index 216db85cd..ee9fa110e 100644
--- a/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp
+++ b/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp
@@ -261,6 +261,7 @@ private slots:
     void pasteAscii();
     void pasteUtf8();
     void destroysPreviousSelection();
+    void destroysSelectionOnLeave();
     void copy();
 };
 
@@ -411,6 +412,35 @@ void tst_primaryselectionv1::destroysPreviousSelection()
     QCOMPOSITOR_TRY_COMPARE(primarySelectionDevice()->m_sentSelectionOffers.size(), 1);
 }
 
+void tst_primaryselectionv1::destroysSelectionOnLeave()
+{
+    QRasterWindow window;
+    window.resize(64, 64);
+    window.show();
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+
+    exec([&] {
+        auto *surface = xdgSurface()->m_surface;
+        keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol
+
+        auto *offer = primarySelectionDevice()->sendDataOffer({"text/plain"});
+        primarySelectionDevice()->sendSelection(offer);
+    });
+
+    QTRY_VERIFY(QGuiApplication::clipboard()->mimeData(QClipboard::Selection));
+    QTRY_VERIFY(QGuiApplication::clipboard()->mimeData(QClipboard::Selection)->hasText());
+
+    QSignalSpy selectionChangedSpy(QGuiApplication::clipboard(), &QClipboard::selectionChanged);
+
+    exec([&] {
+        auto *surface = xdgSurface()->m_surface;
+        keyboard()->sendLeave(surface);
+    });
+
+    QTRY_COMPARE(selectionChangedSpy.count(), 1);
+    QVERIFY(!QGuiApplication::clipboard()->mimeData(QClipboard::Selection)->hasText());
+}
+
 void tst_primaryselectionv1::copy()
 {
     class Window : public QRasterWindow {
@@ -442,6 +472,7 @@ void tst_primaryselectionv1::copy()
     });
     QCOMPOSITOR_TRY_VERIFY(primarySelectionDevice()->m_selectionSource);
     QCOMPOSITOR_TRY_VERIFY(mouseSerials.contains(primarySelectionDevice()->m_serial));
+    QVERIFY(QGuiApplication::clipboard()->ownsSelection());
     QByteArray pastedBuf;
     exec([&](){
         auto *source = primarySelectionDevice()->m_selectionSource;
diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
index 7edb1c2d4..5c6c83baa 100644
--- a/tests/auto/client/shared/corecompositor.cpp
+++ b/tests/auto/client/shared/corecompositor.cpp
@@ -43,6 +43,7 @@ CoreCompositor::CoreCompositor()
         }
     })
 {
+    qputenv("WAYLAND_DISPLAY", m_socketName);
     m_timer.start();
     Q_ASSERT(isClean());
 }
diff --git a/tests/auto/client/shared/datadevice.h b/tests/auto/client/shared/datadevice.h
index a96da86f0..98e780b22 100644
--- a/tests/auto/client/shared/datadevice.h
+++ b/tests/auto/client/shared/datadevice.h
@@ -65,7 +65,6 @@ public:
     ~DataDevice() override;
     void send_data_offer(::wl_resource *resource) = delete;
     DataOffer *sendDataOffer(::wl_client *client, const QStringList &mimeTypes = {});
-    DataOffer *sendDataOffer(const QStringList &mimeTypes = {});
 
     void send_selection(::wl_resource *resource) = delete;
     void sendSelection(DataOffer *offer);
diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h
index fc4d7cc46..c7d85b958 100644
--- a/tests/auto/client/shared/mockcompositor.h
+++ b/tests/auto/client/shared/mockcompositor.h
@@ -84,7 +84,8 @@ public:
 #define QCOMPOSITOR_TEST_MAIN(test) \
 int main(int argc, char **argv) \
 { \
-    setenv("XDG_RUNTIME_DIR", ".", 1); \
+    QTemporaryDir tmpRuntimeDir; \
+    setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1); \
     setenv("XDG_CURRENT_DESKTOP", "qtwaylandtests", 1); \
     setenv("QT_QPA_PLATFORM", "wayland", 1); \
     test tc; \
diff --git a/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp b/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp
index 027e1dfa8..e44475de7 100644
--- a/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp
+++ b/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp
@@ -422,7 +422,8 @@ void tst_WaylandClientXdgShellV6::dontSpamExposeEvents()
 
 int main(int argc, char **argv)
 {
-    setenv("XDG_RUNTIME_DIR", ".", 1);
+    QTemporaryDir tmpRuntimeDir;
+    setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1);
     setenv("QT_QPA_PLATFORM", "wayland", 1); // force QGuiApplication to use wayland plugin
     setenv("QT_WAYLAND_SHELL_INTEGRATION", "xdg-shell-v6", 1);