diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp index cbfdf51576e..54b0b798c5e 100644 --- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp +++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp @@ -59,7 +59,9 @@ #ifdef Q_OS_LINUX # include // from linux/memfd.h: -# define MFD_CLOEXEC 0x0001U +# ifndef MFD_CLOEXEC +# define MFD_CLOEXEC 0x0001U +# endif #endif QT_BEGIN_NAMESPACE diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp index 057002c9dff..1b884a42467 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp @@ -394,6 +394,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr printf("QT_BEGIN_NAMESPACE\n"); printf("QT_WARNING_PUSH\n"); printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n"); + printf("QT_WARNING_DISABLE_CLANG(\"-Wmissing-field-initializers\")\n"); QByteArray serverExport; if (headerPath.size()) { serverExport = QByteArray("Q_WAYLAND_SERVER_") + preProcessorProtocolName + "_EXPORT"; diff --git a/tests/auto/wayland/client/tst_client.cpp b/tests/auto/wayland/client/tst_client.cpp index 7a7c7fa857c..21f748ecd4f 100644 --- a/tests/auto/wayland/client/tst_client.cpp +++ b/tests/auto/wayland/client/tst_client.cpp @@ -264,9 +264,6 @@ void tst_WaylandClient::windowScreens() compositor->sendRemoveOutput(secondOutput); QTRY_COMPARE(QGuiApplication::screens().size(), 1); QCOMPARE(window.screen(), primaryScreen); - - window.destroy(); - QTRY_VERIFY(!compositor->surface()); } void tst_WaylandClient::removePrimaryScreen() @@ -298,9 +295,6 @@ void tst_WaylandClient::removePrimaryScreen() QTRY_COMPARE(window.mousePressEventCount, 1); compositor->sendMouseRelease(surface); QTRY_COMPARE(window.mouseReleaseEventCount, 1); - - window.destroy(); - QTRY_VERIFY(!compositor->surface()); } void tst_WaylandClient::createDestroyWindow() @@ -532,8 +526,6 @@ void tst_WaylandClient::dontCrashOnMultipleCommits() } delete window; - - QTRY_VERIFY(!compositor->surface()); } void tst_WaylandClient::hiddenTransientParent()