diff --git a/mkspecs/features/warnings.pri b/mkspecs/features/warnings.pri
index 69a7649ee..7a868ae25 100644
--- a/mkspecs/features/warnings.pri
+++ b/mkspecs/features/warnings.pri
@@ -23,11 +23,15 @@ contains(BLACK_CONFIG, AllowNoisyWarnings) {
     }
 }
 
-# gcc 5 can warn about missing override keyword
+# gcc 5 can warn about missing override keyword,
+# gcc 6 can do it without thousands of warnings in qt headers
 gcc {
     GCC_VERSION = $$system($$QMAKE_CXX -dumpversion)
     GCC_MAJOR = $$section(GCC_VERSION, ., 0, 0)
-    greaterThan(GCC_MAJOR, 4) {
+    greaterThan(GCC_MAJOR, 5) {
+        QMAKE_CXXFLAGS_WARN_ON *= -Wsuggest-override
+    }
+    greaterThan(GCC_MAJOR, 4):contains(BLACK_CONFIG, AllowNoisyWarnings) {
         QMAKE_CXXFLAGS_WARN_ON *= -Wsuggest-override
     }
 }