diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 12:59:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 12:59:15 +0100 |
| commit | 1dce6f9ed4508f77856d32b5f8957a81ddd5f790 (patch) | |
| tree | 7574efd086ec819f9246875facb14c36f7e849d8 /Tools | |
| parent | ad0bcf935d051c49c394a544a1c64747beb1df21 (diff) | |
| parent | 5d43584babfb43b99159f702160d010778d2190a (diff) | |
| download | qtwebkit-1dce6f9ed4508f77856d32b5f8957a81ddd5f790.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I59ea5b32871dba99276a7e3d9fe5ae8c8487a0d3
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index cf6aabe89..67276b74b 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -52,11 +52,12 @@ INCLUDEPATH += \ CONFIG -= warn_on +gcc: QMAKE_CXXFLAGS += -fno-strict-aliasing + !compiling_thirdparty_code:*-g++*: QMAKE_CXXFLAGS = \ -Wall \ -Wextra \ -Wreturn-type \ - -fno-strict-aliasing \ -Wchar-subscripts \ -Wformat-security \ -Wreturn-type \ |