diff options
author | Liang Qi <liang.qi@qt.io> | 2018-06-13 12:03:52 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-13 12:03:52 +0200 |
commit | c5c6c9bc7074ee66e98d551ae13f999a6b8f7577 (patch) | |
tree | a0ff80433c570bb8d4bf2bec4fe29dab19513aae /tests/auto | |
parent | f96198104d37e94cb7c4198ac7546e7301f849a3 (diff) | |
parent | db7b958fb2d82a85ef45eba852cf411ebde852bf (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I6596d1a127cc93e53ec30cd881da1810cb8076d5
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/client/client/tst_client.cpp | 12 |
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); |