diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 14:06:47 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-15 15:53:16 +0000 |
commit | f98d125b2928d0784d509c8025271fca661ea270 (patch) | |
tree | 214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/3rdparty/libpng.pri | |
parent | c09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff) | |
parent | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
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 \ |