summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/gn_generator.prf13
1 files changed, 5 insertions, 8 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
index a83b59847..bbaed2331 100644
--- a/mkspecs/features/gn_generator.prf
+++ b/mkspecs/features/gn_generator.prf
@@ -109,6 +109,11 @@ CLEAN_QMAKE_RCC = $$clean_path($$QMAKE_RCC)
# CONFIG SETUP
+# Chromium already enables warnings, so enabling them again will just
+# re-enable all the warnings disabled by Chromium.
+QMAKE_CFLAGS -= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS -= $$QMAKE_CXXFLAGS_WARN_ON
+
GN_CONTENTS += "config(\"$${TARGET}_config\") {"
!isEmpty(QMAKE_CFLAGS) {
GN_CONTENTS += " cflags = ["
@@ -122,14 +127,6 @@ GN_CONTENTS += "config(\"$${TARGET}_config\") {"
GN_CONTENTS += " ]"
}
-# Stop the barrage of unused variables warnings.
-gcc|clang|clang_cl {
- QMAKE_CXXFLAGS += "-Wno-unused-parameter"
- QMAKE_CXXFLAGS += "-Wno-unused-variable"
-} else:msvc {
- QMAKE_CXXFLAGS += /wd4100 /wd4101
-}
-
# Chromium activates this, but we need it off to be able to compile QFlags
clang_cl {
QMAKE_CXXFLAGS += "-fno-complete-member-pointers"