From 34d4628b981add039a9a349723cbdff1dadca144 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Sat, 29 Nov 2014 11:52:28 +0100
Subject: 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>
---
 Tools/qmake/mkspecs/features/default_post.prf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 \
-- 
cgit v1.2.3