diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-23 13:29:22 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-23 13:36:04 +0100 |
| commit | 767ee09aba517b0c680dd67a0f213a483429b65f (patch) | |
| tree | 4b18a790aaa5c05a704decb88c19de41934a0a31 /tests/auto/client | |
| parent | 0e5b26942c9ff8b85322a63f577bd7a91ff0851a (diff) | |
| parent | 36dcbb054ec84f6d93d755d905ad3d9bcadb2900 (diff) | |
Merge remote-tracking branch 'qt/5.8' into dev
Change-Id: I8a9455105e8e3519f6a860f58820382d7e337b1e
Diffstat (limited to 'tests/auto/client')
| -rw-r--r-- | tests/auto/client/client/client.pro | 6 | ||||
| -rw-r--r-- | tests/auto/client/client/tst_client.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/tests/auto/client/client/client.pro b/tests/auto/client/client/client.pro index 006d130a0..34fc67474 100644 --- a/tests/auto/client/client/client.pro +++ b/tests/auto/client/client/client.pro @@ -4,11 +4,7 @@ TARGET = tst_client QT += testlib QT += core-private gui-private -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += wayland-client wayland-server -} else { - LIBS += -lwayland-client -lwayland-server -} +QMAKE_USE += wayland-client wayland-server CONFIG += wayland-scanner WAYLANDSERVERSOURCES += \ diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp index 0749239f8..f48bb8724 100644 --- a/tests/auto/client/client/tst_client.cpp +++ b/tests/auto/client/client/tst_client.cpp @@ -248,8 +248,8 @@ void tst_WaylandClient::backingStore() window.hide(); - // hiding the window should detach the buffer - QTRY_VERIFY(surface->image.isNull()); + // hiding the window should destroy the surface + QTRY_VERIFY(!compositor->surface()); } class DndWindow : public QWindow |