From cd77833c3be9b2f8b8ad03da2ffe74ecc01fab51 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 30 Jun 2016 16:45:29 +0200 Subject: [PATCH] add .data() to qpointer access fix build on old gcc versions --- src/wayland/autotests/client/test_shadow.cpp | 2 +- src/wayland/autotests/client/test_wayland_blur.cpp | 2 +- src/wayland/autotests/client/test_wayland_contrast.cpp | 4 ++-- src/wayland/autotests/client/test_wayland_slide.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wayland/autotests/client/test_shadow.cpp b/src/wayland/autotests/client/test_shadow.cpp index 9fed1023bb..80b172189a 100644 --- a/src/wayland/autotests/client/test_shadow.cpp +++ b/src/wayland/autotests/client/test_shadow.cpp @@ -290,7 +290,7 @@ void ShadowTest::testSurfaceDestroy() // destroy the parent surface QSignalSpy surfaceDestroyedSpy(serverSurface, &QObject::destroyed); QVERIFY(surfaceDestroyedSpy.isValid()); - QSignalSpy shadowDestroyedSpy(serverShadow, &QObject::destroyed); + QSignalSpy shadowDestroyedSpy(serverShadow.data(), &QObject::destroyed); QVERIFY(shadowDestroyedSpy.isValid()); surface.reset(); QVERIFY(surfaceDestroyedSpy.wait()); diff --git a/src/wayland/autotests/client/test_wayland_blur.cpp b/src/wayland/autotests/client/test_wayland_blur.cpp index a220526ea9..e3e2a658ba 100644 --- a/src/wayland/autotests/client/test_wayland_blur.cpp +++ b/src/wayland/autotests/client/test_wayland_blur.cpp @@ -201,7 +201,7 @@ void TestBlur::testSurfaceDestroy() // destroy the parent surface QSignalSpy surfaceDestroyedSpy(serverSurface, &QObject::destroyed); QVERIFY(surfaceDestroyedSpy.isValid()); - QSignalSpy blurDestroyedSpy(serverSurface->blur(), &QObject::destroyed); + QSignalSpy blurDestroyedSpy(serverSurface->blur().data(), &QObject::destroyed); QVERIFY(blurDestroyedSpy.isValid()); surface.reset(); QVERIFY(surfaceDestroyedSpy.wait()); diff --git a/src/wayland/autotests/client/test_wayland_contrast.cpp b/src/wayland/autotests/client/test_wayland_contrast.cpp index fef29ad847..4b5d4904cb 100644 --- a/src/wayland/autotests/client/test_wayland_contrast.cpp +++ b/src/wayland/autotests/client/test_wayland_contrast.cpp @@ -182,7 +182,7 @@ void TestContrast::testCreate() QCOMPARE(wl_fixed_from_double(serverSurface->contrast()->saturation()), wl_fixed_from_double(1.7)); // and destroy - QSignalSpy destroyedSpy(serverSurface->contrast(), &QObject::destroyed); + QSignalSpy destroyedSpy(serverSurface->contrast().data(), &QObject::destroyed); QVERIFY(destroyedSpy.isValid()); delete contrast; QVERIFY(destroyedSpy.wait()); @@ -211,7 +211,7 @@ void TestContrast::testSurfaceDestroy() // destroy the parent surface QSignalSpy surfaceDestroyedSpy(serverSurface, &QObject::destroyed); QVERIFY(surfaceDestroyedSpy.isValid()); - QSignalSpy contrastDestroyedSpy(serverSurface->contrast(), &QObject::destroyed); + QSignalSpy contrastDestroyedSpy(serverSurface->contrast().data(), &QObject::destroyed); QVERIFY(contrastDestroyedSpy.isValid()); surface.reset(); QVERIFY(surfaceDestroyedSpy.wait()); diff --git a/src/wayland/autotests/client/test_wayland_slide.cpp b/src/wayland/autotests/client/test_wayland_slide.cpp index 2b142484af..02d128f0d0 100644 --- a/src/wayland/autotests/client/test_wayland_slide.cpp +++ b/src/wayland/autotests/client/test_wayland_slide.cpp @@ -173,7 +173,7 @@ void TestSlide::testCreate() QCOMPARE(serverSurface->slideOnShowHide()->offset(), 15); // and destroy - QSignalSpy destroyedSpy(serverSurface->slideOnShowHide(), &QObject::destroyed); + QSignalSpy destroyedSpy(serverSurface->slideOnShowHide().data(), &QObject::destroyed); QVERIFY(destroyedSpy.isValid()); delete slide; QVERIFY(destroyedSpy.wait());