diff options
| author | John Brooks <john.brooks@dereferenced.net> | 2015-09-02 13:48:08 -0600 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-21 10:10:30 +0000 |
| commit | b826672658fcfce1688b329c32c91423b1c3cbd5 (patch) | |
| tree | 1b5c53cf5edbcca26427f9aaf0daa7c8f218debf /src/3rdparty | |
| parent | 7cde1c029e5a7da7738484758aa8fc7c930d06cc (diff) | |
Fix visibility of bundled zlib symbols with mingw
When QT_VISIBILITY_AVAILABLE is defined, the zlib header would use
visibility("default") instead of Q_DECL_EXPORT, but Windows needs
dllexport for these symbols to be available to QtGui/QtNetwork.
In practice, Q_CORE_EXPORT always has the correct behavior for the
zlib symbols.
Change-Id: I7ab8080528e437260f822ac33e9e4334e2a0fdc8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/zlib/zlib.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 5229707f52..d0908ab6e9 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -34,13 +34,8 @@ #include "zconf.h" #include <qglobal.h> -#if defined(QT_VISIBILITY_AVAILABLE) -# undef ZEXTERN -# define ZEXTERN __attribute__((visibility("default"))) -#else -# undef ZEXTERN -# define ZEXTERN Q_DECL_EXPORT -#endif +#undef ZEXTERN +#define ZEXTERN Q_CORE_EXPORT #ifdef __cplusplus extern "C" { |