From 1ab7880d73fa94befbeb5cdca3fd6d3bbd25f5ba Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Thu, 5 Nov 2015 05:49:07 +0400
Subject: 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>
---
 src/3rdparty/libpng.pri       | 1 -
 src/gui/image/qpnghandler.cpp | 5 -----
 2 files changed, 6 deletions(-)

(limited to 'src')

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)
-- 
cgit v1.2.3