diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-31 16:36:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-31 17:29:06 +0200 |
| commit | a5cf862f612bfd3db91ab1a6974d7c02aa823857 (patch) | |
| tree | 7a0103c0743328edf01ea92e8089a9350e9897ef /mkspecs | |
| parent | c0429719c1a28bb1a0d88862b3a8c84525ee9a48 (diff) | |
| parent | 87d15f2c1b5f890d5477c2979227a872e3ce207b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into refs/staging/5.3
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 \ |