diff options
author | Martin Storsjö <martin@martin.st> | 2018-01-06 00:37:48 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2018-01-18 10:32:57 +0000 |
commit | 8072c36eebd0648770e0f17fae408f33cb371c02 (patch) | |
tree | 5747ec57f60a7a6425ba5dc43beb45c430e929a8 /src | |
parent | 8688f2d4abacf8057701b2b16f71f73be76af3c0 (diff) | |
download | qtbase-8072c36eebd0648770e0f17fae408f33cb371c02.tar.gz |
Skip arm pixman drawhelpers on windows just like on ios
Windows on arm (which uses clang, or msvc, but no gcc is available for
that setup) can't assemble these sources.
(On linux, builds with clang force deferring it to the external
assembler, but for windows on arm, no gas compatible external
assembler is available).
Change-Id: I139572257884cfdc57d3c32061a8c2e28c6e24de
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/painting/painting.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 9ff0b5f5e5..1e14498f79 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -128,7 +128,7 @@ 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:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as -!uikit:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS +!uikit:!win32:!contains(QT_ARCH, "arm64"): 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 |