diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-30 15:52:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-30 15:53:07 +0200 |
| commit | 87d15f2c1b5f890d5477c2979227a872e3ce207b (patch) | |
| tree | b88ad027d3c99ecc4c9e4fe462dab72a4a4a9c8d /mkspecs | |
| parent | 3866c89dee50e3a1156097f3f866e280b327ba28 (diff) | |
| parent | 3fed060b94ff04131de603d4d668ae7853e50a53 (diff) | |
Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: I2a044d44ca991ba20ddd710053b85afb51e362d3
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_headersclean.prf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf index ab0a722628..0650adfe5e 100644 --- a/mkspecs/features/qt_headersclean.prf +++ b/mkspecs/features/qt_headersclean.prf @@ -13,16 +13,11 @@ *-g++*: QMAKE_CXXFLAGS += -Woverloaded-virtual -Wshadow -Wundef # Other nice flags -*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wcast-align -Wchar-subscripts -Wpointer-arith -Wformat-security +*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wchar-subscripts -Wpointer-arith -Wformat-security # Enable pedantic mode, but accept variadic macros and 'long long' usage. *-g++*: QMAKE_CXXFLAGS += -Wno-long-long -Wno-variadic-macros -pedantic-errors -contains(QT_ARCH,arm)|contains(QT_ARCH,mips) { - # There are outstanding alignment issues in some container classes. - *-g++*:QMAKE_CXXFLAGS -= -Wcast-align -} - QMAKE_CXXFLAGS += -DQT_NO_CAST_TO_ASCII \ -DQT_NO_CAST_FROM_ASCII \ -DQT_STRICT_ITERATORS \ |