summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-02-26 16:37:49 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-03-09 14:19:24 +0000
commita31823176af50baaaf78e8ea342b9efbf5c7c4d2 (patch)
tree2a5a36cc280effb6d8de66a714fecc26f8e7a45d /mkspecs
parentafe3e247110dcb790aac1a34f13aa4fe8d5f78c0 (diff)
QNX: enable Neon support to be compiled in for QNX
Neon detection in configure does not work unless correct flags are passed to compiler. Task-number: QTBUG-44690 Change-Id: If119cc9ed80275aaa8796c1be8853559a7670d6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/qcc-base-qnx-armle-v7.conf1
-rw-r--r--mkspecs/common/qcc-base.conf1
2 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/qcc-base-qnx-armle-v7.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf
index 331a65b2bf..12d393f070 100644
--- a/mkspecs/common/qcc-base-qnx-armle-v7.conf
+++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf
@@ -10,6 +10,7 @@ include(unix.conf)
QMAKE_CC = qcc -Vgcc_ntoarmv7le
QMAKE_CXX = qcc -Vgcc_ntoarmv7le
QNX_CPUDIR = armle-v7
+QMAKE_CFLAGS += -mfpu=neon
include(qcc-base-qnx.conf)
diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf
index f529d7fc7b..09fdabce43 100644
--- a/mkspecs/common/qcc-base.conf
+++ b/mkspecs/common/qcc-base.conf
@@ -33,7 +33,6 @@ QMAKE_CFLAGS_SSE4_1 += -msse4.1
QMAKE_CFLAGS_SSE4_2 += -msse4.2
QMAKE_CFLAGS_AVX += -mavx
QMAKE_CFLAGS_AVX2 += -mavx2
-QMAKE_CFLAGS_NEON += -mfpu=neon
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -lang-c++
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS