summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2010-07-29 09:24:12 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-29 09:24:12 (GMT)
commite98ec548d4f7b0558742014933457f756bdd8bf1 (patch)
treefcbecb6fd9da1cf4871de2e6c0e626f910af6bbb /src/gui/image
parent510c8d6bd7c7623bb41878b8246375a403f3ba1d (diff)
downloadQt-e98ec548d4f7b0558742014933457f756bdd8bf1.zip
Qt-e98ec548d4f7b0558742014933457f756bdd8bf1.tar.gz
Qt-e98ec548d4f7b0558742014933457f756bdd8bf1.tar.bz2
Fix compilation with QT_NO_TEXTCODEC
Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpnghandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 2cf8222..dc54313 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -389,7 +389,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngHeader()
while (num_text--) {
QString key, value;
-#if defined(PNG_iTXt_SUPPORTED)
+#if defined(PNG_iTXt_SUPPORTED) && !defined(QT_NO_TEXTCODEC)
if (text_ptr->lang) {
QTextCodec *codec = QTextCodec::codecForName(text_ptr->lang);
if (codec) {