From 9251e894e4a5d81a249424a1866e1a90c097a96a Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 19 Dec 2017 08:10:09 +0000 Subject: [PATCH] Replace QCOMPARE(nullptr) with QVERIFY QCOMPARE(T*, nullptr) apparently isn't valid on Qt5.7 --- src/wayland/autotests/client/test_wayland_appmenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland/autotests/client/test_wayland_appmenu.cpp b/src/wayland/autotests/client/test_wayland_appmenu.cpp index 7577a94bf1..8ba19fa9dc 100644 --- a/src/wayland/autotests/client/test_wayland_appmenu.cpp +++ b/src/wayland/autotests/client/test_wayland_appmenu.cpp @@ -166,7 +166,7 @@ void TestAppmenu::testCreateAndSet() auto serverSurface = serverSurfaceCreated.first().first().value(); QSignalSpy appMenuCreated(m_appmenuManagerInterface, &KWayland::Server::AppMenuManagerInterface::appMenuCreated); - QCOMPARE(m_appmenuManagerInterface->appMenuForSurface(serverSurface), nullptr); + QVERIFY(!m_appmenuManagerInterface->appMenuForSurface(serverSurface)); auto appmenu = m_appmenuManager->create(surface.data(), surface.data()); QVERIFY(appMenuCreated.wait()); @@ -189,7 +189,7 @@ void TestAppmenu::testCreateAndSet() QVERIFY(destroyedSpy.isValid()); delete appmenu; QVERIFY(destroyedSpy.wait()); - QCOMPARE(m_appmenuManagerInterface->appMenuForSurface(serverSurface), nullptr); + QVERIFY(!m_appmenuManagerInterface->appMenuForSurface(serverSurface)); } QTEST_GUILESS_MAIN(TestAppmenu)