diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libpng.pri | 1 | ||||
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 5 |
2 files changed, 0 insertions, 6 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 \ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 776a61d8fe..e9944e1750 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -43,13 +43,8 @@ #include <qvariant.h> #include <qvector.h> -#ifdef QT_USE_BUNDLED_LIBPNG -#include <../../3rdparty/libpng/png.h> -#include <../../3rdparty/libpng/pngconf.h> -#else #include <png.h> #include <pngconf.h> -#endif #if PNG_LIBPNG_VER >= 10400 && PNG_LIBPNG_VER <= 10502 \ && defined(PNG_PEDANTIC_WARNINGS_SUPPORTED) |