diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-07-21 10:25:26 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-07-21 14:46:49 +0200 |
| commit | fa3b416ca4993c11bee91e1c52ef4aea8ad4438a (patch) | |
| tree | 1339b458b9974bba95a3e8d93ed0ec947ac32fcf | |
| parent | 603a1809481eb4d4ca972f0f64915d29fb99f53b (diff) | |
Stop re-enabling warnings disabled by Chromium
Adding -Wall after -Wno-x will undo the -Wno-x.
Change-Id: I223b40e495d762d2420b519f080792bca8e71bdd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 13 | ||||
| -rw-r--r-- | src/core/net/cookie_monster_delegate_qt.h | 6 |
2 files changed, 5 insertions, 14 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" diff --git a/src/core/net/cookie_monster_delegate_qt.h b/src/core/net/cookie_monster_delegate_qt.h index bcbbe4c52..c55bcff94 100644 --- a/src/core/net/cookie_monster_delegate_qt.h +++ b/src/core/net/cookie_monster_delegate_qt.h @@ -53,11 +53,6 @@ #include "qtwebenginecoreglobal_p.h" -QT_WARNING_PUSH -// For some reason adding -Wno-unused-parameter to QMAKE_CXXFLAGS has no -// effect with clang, so use a pragma for these dirty chromium headers -QT_WARNING_DISABLE_CLANG("-Wunused-parameter") - // We need to work around Chromium using 'signals' as a variable name in headers: #ifdef signals #define StAsH_signals signals @@ -73,7 +68,6 @@ QT_WARNING_DISABLE_CLANG("-Wunused-parameter") #define signals StAsH_signals #undef StAsH_signals #endif -QT_WARNING_POP #include <QNetworkCookie> #include <QPointer> |