summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2014-11-29 11:52:28 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-11-29 15:13:41 +0100
commit34d4628b981add039a9a349723cbdff1dadca144 (patch)
tree63e2eb481b622b6fe1cc0e2c89d1e7de8c5d6de1
parentdef5fef7fbf7fedece54d52188f75a90616599a4 (diff)
Fix disabling of aliasing for all gcc alike compilers
Don't rely on the makespec to contain g++ in its name, instead use QMAKE_COMPILER, which gets added to CONFIG. Fixes crashes on QNX. Change-Id: If8d2a6a7aa9998b311b2ca137af2fa236adecb00 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r--Tools/qmake/mkspecs/features/default_post.prf3
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 \