diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
| commit | b77269ff500e184237d523496e17639c94009ac8 (patch) | |
| tree | 43e51355eaa03f0185ef82826fa0436821674426 /tests/auto/compositor/compositor | |
| parent | 12058b161e5f0d6f76523dc831acc8bdbc027fec (diff) | |
| parent | bacb3cdd83fd5c3112c5120130881ac3faa421fe (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2
Diffstat (limited to 'tests/auto/compositor/compositor')
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index e87fab2a8..1397414af 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -545,11 +545,6 @@ void tst_WaylandCompositor::mapSurfaceHiDpi() QObject::connect(waylandSurface, &QWaylandSurface::hasContentChanged, verifyComittedState); QSignalSpy hasContentSpy(waylandSurface, SIGNAL(hasContentChanged())); -#if QT_DEPRECATED_SINCE(5, 13) - QObject::connect(waylandSurface, &QWaylandSurface::sizeChanged, verifyComittedState); - QSignalSpy sizeSpy(waylandSurface, SIGNAL(sizeChanged())); -#endif - QObject::connect(waylandSurface, &QWaylandSurface::bufferSizeChanged, verifyComittedState); QSignalSpy bufferSizeSpy(waylandSurface, SIGNAL(bufferSizeChanged())); @@ -575,9 +570,6 @@ void tst_WaylandCompositor::mapSurfaceHiDpi() wl_surface_commit(surface); QTRY_COMPARE(hasContentSpy.count(), 1); -#if QT_DEPRECATED_SINCE(5, 13) - QTRY_COMPARE(sizeSpy.count(), 1); -#endif QTRY_COMPARE(bufferSizeSpy.count(), 1); QTRY_COMPARE(destinationSizeSpy.count(), 1); QTRY_COMPARE(bufferScaleSpy.count(), 1); |