diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-11-05 05:49:07 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-11-23 18:52:35 +0000 |
commit | 1ab7880d73fa94befbeb5cdca3fd6d3bbd25f5ba (patch) | |
tree | 836e2b8a05692a254e119a5a4c19af5583ed5d5b /src/gui/image/qpnghandler.cpp | |
parent | 7c22e14300746b6dc7b738d8a2cd0a7d60136e35 (diff) |
Get rid of QT_USE_BUNDLED_LIBPNG
In fact, this is an extra info no one ever cares about.
We already have properly configured INCLUDEPATH to look for png.h.
Change-Id: I27fec4d474570683c6c371dff34472a7c650fe65
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui/image/qpnghandler.cpp')
-rw-r--r-- | src/gui/image/qpnghandler.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
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) |