diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-04-08 12:30:36 +0200 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-04-09 12:14:28 +0000 |
| commit | 68c137cc725ceadec68c455e0e3e365ecb00f2c1 (patch) | |
| tree | 242485964753e2e7890015694a916c71755cdfb3 /src/3rdparty/libpng.pri | |
| parent | f0cee4568ec3bd58cbc33108a6e606c3294e0fb3 (diff) | |
Update bundled libpng to version 1.6.17
Merged in the upstream version, which obsoleted many of the local
patches. The remaining diff to clean 1.6.17 is archived in the
qtpatches.diff file.
Change-Id: I5065435dc5a922d3f4a46eb37a23a4877dde2ee6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libpng.pri')
| -rw-r--r-- | src/3rdparty/libpng.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/libpng.pri b/src/3rdparty/libpng.pri index ae71032e8c..f8516bd5db 100644 --- a/src/3rdparty/libpng.pri +++ b/src/3rdparty/libpng.pri @@ -1,4 +1,5 @@ DEFINES *= QT_USE_BUNDLED_LIBPNG +DEFINES += PNG_ARM_NEON_OPT=0 INCLUDEPATH += $$PWD/libpng SOURCES += $$PWD/libpng/png.c \ $$PWD/libpng/pngerror.c \ |