diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:16:33 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:16:33 +0300 |
| commit | 18e4cf290048726933bb5cf487e947e65b3550a6 (patch) | |
| tree | 9e5024b21dbc18cfb8740fc3cda07804aa1470a4 /src/gui/painting/painting.pri | |
| parent | ae5db669e8989fe793949346d8061c67e5ec31cd (diff) | |
| parent | 9e97d64ccd27adcb2053c90cfbcafaef68e53893 (diff) | |
Merge 5.12 into 5.12.3
Change-Id: I76905e3540585c3be221b89453c725828b05940b
Diffstat (limited to 'src/gui/painting/painting.pri')
| -rw-r--r-- | src/gui/painting/painting.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index c3585a4647..a90abed4c0 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -131,9 +131,11 @@ ARCH_HASWELL_SOURCES += painting/qdrawhelper_avx2.cpp NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp NEON_HEADERS += painting/qdrawhelper_neon_p.h -NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S !uikit:!win32:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as -!uikit:!win32:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS +!uikit:!win32:!integrity:!contains(QT_ARCH, "arm64") { + NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S + DEFINES += ENABLE_PIXMAN_DRAWHELPERS +} MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp MIPS_DSP_HEADERS += painting/qdrawhelper_mips_dsp_p.h painting/qt_mips_asm_dsp_p.h |