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

Change-Id: Ie9d7d49216b7d03f83306cf06f6439080f3457a3

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index e9ae5e4b3..e19acff7c 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -184,6 +184,7 @@ private slots:
     void glWindow();
 #endif // QT_CONFIG(opengl)
     void longWindowTitle();
+    void longWindowTitleWithUtf16Characters();
 
 private:
     MockCompositor *compositor = nullptr;
@@ -502,6 +503,16 @@ void tst_WaylandClient::longWindowTitle()
     QTRY_VERIFY(compositor->surface());
 }
 
+void tst_WaylandClient::longWindowTitleWithUtf16Characters()
+{
+    QWindow window;
+    QString absurdlyLongTitle = QString("三").repeated(10000);
+    Q_ASSERT(absurdlyLongTitle.length() == 10000); // just making sure the test isn't broken
+    window.setTitle(absurdlyLongTitle);
+    window.show();
+    QTRY_VERIFY(compositor->surface());
+}
+
 int main(int argc, char **argv)
 {
     setenv("XDG_RUNTIME_DIR", ".", 1);