diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-04-08 16:20:01 +0200 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-04-13 07:56:16 +0000 |
| commit | 4bc86c34e2d2f4c1d1c1002c94f857d9adc51194 (patch) | |
| tree | 587fb7cbbe3be24884a27285ebed9c116c8fb469 /src/3rdparty/libpng.pri | |
| parent | a16695f45f8de7608584937d5b4df34613eb0685 (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: Ibe6f69d9002adb1ad1c4037670a3a4358ad1a18e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/libpng.pri')
| -rw-r--r-- | src/3rdparty/libpng.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libpng.pri b/src/3rdparty/libpng.pri index 7ac1910151..0ff34830f0 100644 --- a/src/3rdparty/libpng.pri +++ b/src/3rdparty/libpng.pri @@ -1,5 +1,5 @@ DEFINES *= QT_USE_BUNDLED_LIBPNG -!isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE +DEFINES += PNG_ARM_NEON_OPT=0 INCLUDEPATH += $$PWD/libpng SOURCES += $$PWD/libpng/png.c \ $$PWD/libpng/pngerror.c \ |