diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-21 08:46:34 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-21 08:46:34 (GMT) |
| commit | a3c66f6898c560820ff5768159e4af1323219161 (patch) | |
| tree | 143fa35cd328a2d9fb4690d703050d01eb407bbb /src/gui/image/qpnghandler.cpp | |
| parent | 51c2b10379b0bbed5804f0f8e2eca82e5bb4d0bf (diff) | |
| parent | 86ceda033eda6bd615134f71b9850081a0c808c9 (diff) | |
| download | Qt-a3c66f6898c560820ff5768159e4af1323219161.zip Qt-a3c66f6898c560820ff5768159e4af1323219161.tar.gz Qt-a3c66f6898c560820ff5768159e4af1323219161.tar.bz2 | |
Merge remote branch 'qt/master' into staging-master
Conflicts:
src/gui/image/qpnghandler.cpp
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/gui/image/qpnghandler.cpp')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 450e8c6..4d5694f 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -507,8 +507,10 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage) png_read_end(png_ptr, end_info); readPngTexts(end_info); +#ifndef QT_NO_IMAGE_TEXT for (int i = 0; i < readTexts.size()-1; i+=2) outImage->setText(readTexts.at(i), readTexts.at(i+1)); +#endif png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); delete [] row_pointers; |