diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-15 15:50:19 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-20 17:49:57 +0000 |
| commit | 88e6542ecc0451df2f291db928c4d4d549aa0ca2 (patch) | |
| tree | e672d01ca5506dacb67af7687231092f2afb7dfe /mkspecs | |
| parent | 9831a84d7b80bbeadc092d39c7bfefcd826bb680 (diff) | |
Fix GCC 7 developer build
Disables escalating the implicit fallthough warning to an error, since
Qt is not yet free of unmarked implicit fallthroughs.
With this we can clean the code in the dev branch instead of in 5.6 and
5.8, and only backport bug fixes.
Change-Id: Id30ee21b77de6defcb7d5bb1e05e86c0db098481
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 9efd29d1e27702fadcdfa207c9605fcb5b6b8dba)
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_common.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 6512fb1db2..08b3f3e5af 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -82,6 +82,9 @@ warnings_are_errors:warning_clean { # error: assuming signed overflow does not occur when assuming that (X + c) < X is always false QMAKE_CXXFLAGS_WARN_ON += -Wno-error=strict-overflow + # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs. + greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough + # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135 android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix } |