diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:50:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:11:02 +0200 |
| commit | eaec2b664aa2c3cbca13b425901888468a4652a1 (patch) | |
| tree | 93dbd19f3b538baa81dec6c04e5258161f7d8cfb /src/gui/painting/painting.pri | |
| parent | 278e557ceacbe7de728987a4a5365f78e56d76b1 (diff) | |
| parent | 31c251765db45a068f1268027e5dd600151af1e5 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/gui/painting/qcoregraphics.mm
src/network/access/qnetworkrequest.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5
Diffstat (limited to 'src/gui/painting/painting.pri')
| -rw-r--r-- | src/gui/painting/painting.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index c47060a2ad..a61865a0b6 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -99,6 +99,11 @@ SOURCES += \ painting/qplatformbackingstore.cpp \ painting/qpathsimplifier.cpp +darwin { + HEADERS += painting/qcoregraphics_p.h + SOURCES += painting/qcoregraphics.mm +} + SSE2_SOURCES += painting/qdrawhelper_sse2.cpp SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \ |