path: root/mkspecs
diff options
authorThomas Senyk <>2014-03-03 18:15:37 +0100
committerThe Qt Project <>2014-03-06 17:22:55 +0100
commitaff7e6c02e35641f7d7a2e7543d0f905d96e1667 (patch)
tree8786d8358a3a690471f115fb5408e6e174db9c03 /mkspecs
parent7b1058ac92276b81b1d5164fb4ba651421df7990 (diff)
simd.prf: replace CONFIG based neon check with a QT_CPU_FEATURES check
If one doesn't set CONFIG+=neon in it's mkspec but the compiler enables it, Qt fails during linking of libQtGui, because simd.prf isn't executed as needed (doesn't run into neon{..}). Although a mkspec which enabled neon (-mfpu=neon) without CONFIG+=neon could be considered broken, it's still simpler to just 'fix' Qt to not fail unexpected. Follow-up to e5066a3a2eb965e64f6bf6e112739222574d66d7 Task-number: QTBUG-37264 Change-Id: I3aa0afbe430547971e76c2c988697c133d69796b Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'mkspecs')
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf
index 84a5d16d77..4f86f60700 100644
--- a/mkspecs/features/simd.prf
+++ b/mkspecs/features/simd.prf
@@ -117,7 +117,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
silent:avx2_compiler.commands = @echo compiling[avx2] ${QMAKE_FILE_IN} && $$avx2_compiler.commands
QMAKE_EXTRA_COMPILERS += avx2_compiler
- neon {
+ contains(QT_CPU_FEATURES.$$QT_ARCH, neon) {
neon_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS)