summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qtwaylandscanner/qtwaylandscanner.cpp3
-rw-r--r--tests/auto/client/client/tst_client.cpp2
-rw-r--r--tests/auto/compositor/compositor/mockkeyboard.cpp3
-rw-r--r--tests/auto/compositor/compositor/mockpointer.cpp3
4 files changed, 9 insertions, 2 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index f8079509..1b0a4a14 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -639,6 +639,7 @@ bool Scanner::process()
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");
printf("\n");
printf("namespace QtWaylandServer {\n");
@@ -972,6 +973,7 @@ bool Scanner::process()
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 clientExport;
if (m_headerPath.size())
@@ -1079,6 +1081,7 @@ bool Scanner::process()
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");
printf("\n");
printf("namespace QtWayland {\n");
printf("\n");
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index db4eb77e..54d58659 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -21,8 +21,6 @@
using namespace MockCompositor;
-static const QSize screenSize(1600, 1200);
-
constexpr int dataDeviceVersion = 1;
class TestCompositor : public WlShellCompositor {
diff --git a/tests/auto/compositor/compositor/mockkeyboard.cpp b/tests/auto/compositor/compositor/mockkeyboard.cpp
index f8481799..0866c28a 100644
--- a/tests/auto/compositor/compositor/mockkeyboard.cpp
+++ b/tests/auto/compositor/compositor/mockkeyboard.cpp
@@ -3,6 +3,9 @@
#include "mockkeyboard.h"
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+QT_WARNING_DISABLE_CLANG("-Wmissing-field-initializers")
+
void keyboardKeymap(void *keyboard, struct wl_keyboard *wl_keyboard, uint32_t format, int32_t fd, uint32_t size)
{
Q_UNUSED(keyboard);
diff --git a/tests/auto/compositor/compositor/mockpointer.cpp b/tests/auto/compositor/compositor/mockpointer.cpp
index 1929564b..cc8de34c 100644
--- a/tests/auto/compositor/compositor/mockpointer.cpp
+++ b/tests/auto/compositor/compositor/mockpointer.cpp
@@ -3,6 +3,9 @@
#include "mockpointer.h"
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+QT_WARNING_DISABLE_CLANG("-Wmissing-field-initializers")
+
static void pointerEnter(void *pointer, struct wl_pointer *wlPointer, uint serial, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y)
{
Q_UNUSED(wlPointer);