summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-02-11 15:02:05 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-02-11 17:08:11 +0000
commit92087db8f85f5131e3ac33b70eeb28bd8f62f491 (patch)
tree9edb12726595ba89872c0c6bdaaed2915e646fcb
parent082a7c4655acce06baf4e2bce43b281875ef3f68 (diff)
Fix build of neon accelerated drawing helpers
We must instruct cmake that we're interested in providing input files for the assembler directly and the file name needs to be correct, too :) Change-Id: I7cccb6ac66d28261ee71869991b14ac20c63050e Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/gui/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8975c090ed..8946d55d83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(QtBase
VERSION 5.12.0
DESCRIPTION "Qt Base Libraries"
HOMEPAGE_URL "https://qt.io/"
- LANGUAGES CXX C
+ LANGUAGES CXX C ASM
)
## Add some paths to check for cmake modules:
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 64d39288bc..e81e31ed89 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -424,7 +424,7 @@ extend_target(Gui CONDITION QT_FEATURE_neon
image/qimage_neon.cpp
painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
painting/qdrawhelper_mips_dspr2_asm.S
- painting/qimagescale_neon.cpp painting/qimagescale_neon_asm.S
+ painting/qimagescale_neon.cpp painting/qdrawhelper_neon_asm.S
../3rdparty/pixman/pixman-arm-neon-asm.S
COMPILE_FLAGS ${QT_CFLAGS_NEON}
)