aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2016-11-07 10:57:43 +1100
committerNeil <nyamatongwe@gmail.com>2016-11-07 10:57:43 +1100
commit07793d0c5a4ffb2c78637109dde2b922af6255da (patch)
treeab6ae47a46d06693bca748c4ea441dc5a952935d
parentab0bd10bf685d2868b245893afd7512ddadc5fb1 (diff)
downloadscintilla-mirror-07793d0c5a4ffb2c78637109dde2b922af6255da.tar.gz
Move warning suppression from global header to Qt platform layer header so
warnings are visible for platform-independent code.
-rw-r--r--include/Platform.h4
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.h.template4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/Platform.h b/include/Platform.h
index 63269d003..1ff48ecb1 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -526,8 +526,4 @@ public:
}
#endif
-#if defined(__GNUC__) && defined(SCINTILLA_QT)
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
#endif
diff --git a/qt/ScintillaEdit/ScintillaEdit.h.template b/qt/ScintillaEdit/ScintillaEdit.h.template
index 052d87c74..9d7c1d894 100644
--- a/qt/ScintillaEdit/ScintillaEdit.h.template
+++ b/qt/ScintillaEdit/ScintillaEdit.h.template
@@ -71,4 +71,8 @@ public:
}
#endif
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
#endif /* SCINTILLAEDIT_H */