remove miniz reference

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index 5d1dcd7..4609f44 100644 (file)
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -59,8 +59,7 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qstring.h>
 
-// to ensure that when building with miniz the FileInfo struct
-// gets proper typedefs for crc32
+// to ensure that the FileInfo struct gets proper typedefs for crc32
 #include <zlib.h>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index 3a1c03a..396f0e2 100644 (file)
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -154,13 +154,7 @@ QByteArray qt_inflateGZipDataFrom(QIODevice *device)
 
         if (zlibResult == Z_STREAM_END) {
             // Make sure there are no more members to process before exiting
-#ifdef MINIZ_HEADER_INCLUDED
-            // miniz does not support inflateReset()
-            if (!(zlibStream.avail_in && inflateEnd(&zlibStream) == Z_OK
-                && inflateInit2(&zlibStream, MAX_WBITS + 16) == Z_OK))
-#else
             if (!(zlibStream.avail_in && inflateReset(&zlibStream) == Z_OK))
-#endif
                 stillMoreWorkToDo = false;
         }
     }