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

 Conflicts:
	.qmake.conf

Change-Id: I6596d1a127cc93e53ec30cd881da1810cb8076d5

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 21f748ecd..6b7daecd5 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -162,6 +162,7 @@ public slots:
         // make sure the surfaces from the last test are properly cleaned up
         // and don't show up as false positives in the next test
         QTRY_VERIFY(!compositor->surface());
+        QTRY_VERIFY(!compositor->iviSurface());
         QTRY_VERIFY(!compositor->xdgToplevelV6());
     }
 
@@ -181,6 +182,7 @@ private slots:
     void hiddenTransientParent();
     void hiddenPopupParent();
     void glWindow();
+    void longWindowTitle();
 
 private:
     MockCompositor *compositor = nullptr;
@@ -597,6 +599,16 @@ void tst_WaylandClient::glWindow()
     QTRY_VERIFY(!compositor->surface());
 }
 
+void tst_WaylandClient::longWindowTitle()
+{
+    // See QTBUG-68715
+    QWindow window;
+    QString absurdlyLongTitle(10000, QLatin1Char('z'));
+    window.setTitle(absurdlyLongTitle);
+    window.show();
+    QTRY_VERIFY(compositor->surface());
+}
+
 int main(int argc, char **argv)
 {
     setenv("XDG_RUNTIME_DIR", ".", 1);