From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 29 Dec 2012 16:29:15 +0000 (+0100)
Subject: qt5: Fix use of zlib
X-Git-Tag: 2.1.0beta1~256
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ba3332c6;p=features.git

qt5: Fix use of zlib

As Qt5 includes zlib as well, we have to use the same naming convention.
---

diff --git a/src/support/gzstream.h b/src/support/gzstream.h
index 858784dae9..01658ec341 100644
--- a/src/support/gzstream.h
+++ b/src/support/gzstream.h
@@ -32,6 +32,10 @@
 // standard C++ with new header file names and std:: namespace
 #include <iostream>
 #include <fstream>
+#include <QtCore>
+#if (defined Q_OS_WIN && QT_VERSION >= 0x050000)
+#define Z_PREFIX 1
+#endif
 #include <zlib.h>
 
 // For LyX