2 files changed, 14 insertions, 0 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
index bb5926986..a1937c923 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
@@ -272,6 +272,8 @@ void DataDeviceManager::comp_destroy(wl_client *, wl_resource *)
 {
 }
 
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+
 const struct wl_data_offer_interface DataDeviceManager::compositor_offer_interface = {
     DataDeviceManager::comp_accept,
     DataDeviceManager::comp_receive,
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 5b9707a5a..01dfa9215 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -392,6 +392,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
 
         printf("\n");
         printf("QT_BEGIN_NAMESPACE\n");
+        printf("QT_WARNING_PUSH\n");
+        printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
         QByteArray serverExport;
         if (headerPath.size()) {
             serverExport = QByteArray("Q_WAYLAND_SERVER_") + preProcessorProtocolName + "_EXPORT";
@@ -533,6 +535,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
 
         printf("}\n");
         printf("\n");
+        printf("QT_WARNING_POP\n");
         printf("QT_END_NAMESPACE\n");
         printf("\n");
         printf("#endif\n");
@@ -545,6 +548,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
             printf("#include <%s/qwayland-server-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData());
         printf("\n");
         printf("QT_BEGIN_NAMESPACE\n");
+        printf("QT_WARNING_PUSH\n");
+        printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
         printf("\n");
         printf("namespace QtWaylandServer {\n");
 
@@ -827,6 +832,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
         }
         printf("}\n");
         printf("\n");
+        printf("QT_WARNING_POP\n");
         printf("QT_END_NAMESPACE\n");
     }
 
@@ -843,6 +849,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
         printf("#include <QString>\n");
         printf("\n");
         printf("QT_BEGIN_NAMESPACE\n");
+        printf("QT_WARNING_PUSH\n");
+        printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
 
         QByteArray clientExport;
 
@@ -940,6 +948,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
         }
         printf("}\n");
         printf("\n");
+        printf("QT_WARNING_POP\n");
         printf("QT_END_NAMESPACE\n");
         printf("\n");
         printf("#endif\n");
@@ -952,6 +961,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
             printf("#include <%s/qwayland-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData());
         printf("\n");
         printf("QT_BEGIN_NAMESPACE\n");
+        printf("QT_WARNING_PUSH\n");
+        printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
         printf("\n");
         printf("namespace QtWayland {\n");
         for (int j = 0; j < interfaces.size(); ++j) {
@@ -1134,6 +1145,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
         }
         printf("}\n");
         printf("\n");
+        printf("QT_WARNING_POP\n");
         printf("QT_END_NAMESPACE\n");
     }
 }