diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:53 +0100 |
| commit | ea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (patch) | |
| tree | 3aadba9965f8a77e2ce4169233b524f091a0e176 /src/3rdparty | |
| parent | bdf49888ef4044bd513bfd4c888071b41119a6d4 (diff) | |
| parent | b13801fd550d4eef2e45ac3e11304571e0146dd9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ib43c6f126998eefcfed9a7c1f2bcbac8b4dd05ec
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libpng.pri | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/libpng.pri b/src/3rdparty/libpng.pri index f8516bd5db..a5fe32f867 100644 --- a/src/3rdparty/libpng.pri +++ b/src/3rdparty/libpng.pri @@ -1,4 +1,3 @@ -DEFINES *= QT_USE_BUNDLED_LIBPNG DEFINES += PNG_ARM_NEON_OPT=0 INCLUDEPATH += $$PWD/libpng SOURCES += $$PWD/libpng/png.c \ |