summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-11-11 13:59:50 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-11-11 15:39:47 +0000
commit37ec5a0462c79db3804e16cdc8b39e840f0bf292 (patch)
tree9eac9dcf7647b87c250bf8b69a5653414fea3a89 /src
parent52345a1076dcd09a6439bb16850d7f0fd4fad237 (diff)
Fix linking on armv7
Don't compile the neon pixman sources twice into QtGui. They're already added earlier with add_qt_simd_part. Change-Id: Iaccb14b6ab6466104a9f02c217c9332bcbf7bead Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src')
-rw-r--r--src/gui/CMakeLists.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 79c3d34aee..29815617f4 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -645,14 +645,6 @@ extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
QT_COMPILER_SUPPORTS_SSE4_2
)
-# special case begin
-extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64" AND QT_FEATURE_neon)
- SOURCES
- ../3rdparty/pixman/pixman-arm-neon-asm.S
- painting/qdrawhelper_neon_asm.S
-)
-# special case end
-
extend_target(Gui CONDITION QT_FEATURE_regularexpression
SOURCES
util/qshadergenerator.cpp util/qshadergenerator_p.h