diff options
| author | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2014-12-21 06:36:24 +0530 |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2015-01-08 09:31:49 +0100 |
| commit | da6a706eb31f1505edfaeefefc1adfb65ea6d893 (patch) | |
| tree | 07801286c4b9170a238d54b7be80489b048370ad /src/corelib | |
| parent | 72bc032ca8f7fc00900a9ca20bab8560ccf99727 (diff) | |
fix error when cross-compiling with --system-zlib
This is broken since 1f461ac45bfa8887261510a95fb33a346d68eaba, where
Z_PREFIX was defined to namespace the bundled zlib symbols. The
bundled zlib is used by bootstrap.pro when cross-compiling which uses
the namespaced symbols. This breaks linking of rcc when --system-zlib
is used, as it will try to link to compress2 instead of z_compress2.
To fix this, the aliases are pulled in via zconf.h and the bundled
zlib is prepended to the INCLUDEPATH (i.e. before the system zlib).
Change-Id: Iec76cbdead40f888e2ac6a887ec8f3b7bc7db501
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index d8b2efbef3..a3c1cc3907 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -43,6 +43,7 @@ #include <qmath.h> #ifndef QT_NO_COMPRESS +#include <zconf.h> #include <zlib.h> #endif #include <ctype.h> |