diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qpnghandler.cpp --- a/src/gui/image/qpnghandler.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qpnghandler.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -389,7 +389,7 @@ 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) {