diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
| commit | bb0fec8057dd11c359bfcb4aefb66d9b210f52a6 (patch) | |
| tree | 903e3220087ff7a3210390933ba3d8b8f7eb5ea3 /src/gui/painting | |
| parent | 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b (diff) | |
| parent | 4ba535616b8d3dfda7fbe162c6513f3008c1077a (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/corelib/corelib.pro
src/corelib/global/qrandom.cpp
src/network/access/qhttpnetworkrequest_p.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoansmenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/offscreen/qoffscreenintegration.h
src/widgets/kernel/qaction.cpp
src/widgets/widgets.pro
Done-with: Andy Shaw <andy.shaw@qt.io>
Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
Diffstat (limited to 'src/gui/painting')
| -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 1e14498f79..29bef14f0c 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -127,7 +127,7 @@ AVX2_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:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as +!uikit:!win32:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as !uikit:!win32:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp |