OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e4e6c4
)
remove redundant conditional for using bundled libpng
author
Ivailo Monev
<xakepa10@gmail.com>
Fri, 15 Jul 2016 16:09:59 +0000
(16:09 +0000)
committer
Ivailo Monev
<xakepa10@gmail.com>
Fri, 15 Jul 2016 16:09:59 +0000
(16:09 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/image/qpnghandler.cpp
patch
|
blob
|
history
diff --git
a/src/gui/image/qpnghandler.cpp
b/src/gui/image/qpnghandler.cpp
index
a479029
..
68acfa3
100644
(file)
--- a/
src/gui/image/qpnghandler.cpp
+++ b/
src/gui/image/qpnghandler.cpp
@@
-50,13
+50,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)