The branch, master, has been updated. - Log -----------------------------------------------------------------
commit ba3332c62d5ff4eb255c78cebc041f8186ecaa5f Author: Vincent van Ravesteijn <[email protected]> Date: Sat Dec 29 17:29:15 2012 +0100 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 858784d..01658ec 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 ----------------------------------------------------------------------- Summary of changes: src/support/gzstream.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
