qt6-bb10/src
Ashish Kulkarni da6a706eb3 fix error when cross-compiling with --system-zlib
This is broken since 1f461ac45b, 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>
2015-01-08 09:31:49 +01:00
..
3rdparty fix error when cross-compiling with --system-zlib 2015-01-08 09:31:49 +01:00
android Update gradle build script. 2014-12-18 09:46:31 +01:00
angle [ANGLE] Fix compilation with MSVC2013 Update4 2014-12-15 09:19:48 +01:00
concurrent Update license headers and add new license files 2014-09-24 12:26:19 +02:00
corelib fix error when cross-compiling with --system-zlib 2015-01-08 09:31:49 +01:00
dbus Make QtDBus unit tests compile with runtime dbus-1 too 2015-01-06 18:16:32 +01:00
gui Fix build error with Intel Compiler 15 on Windows 2015-01-06 17:48:29 +01:00
network Fix crash if PAC script retrieval returns a null CFData instance 2015-01-07 10:29:13 +01:00
opengl Qt OpenGL is deprecated with 5.4. Show that in the docs as well 2014-12-18 09:48:37 +01:00
openglextensions purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
platformheaders Doc: Adding API reference section in Qt Platform Headers page. 2014-09-30 21:00:50 +02:00
platformsupport QCoreTextFontDatabase: close memory leak in themeFont 2015-01-07 21:32:05 +01:00
plugins Refactor networkmanager QtBearer backend to use QDBusAbstractInterface. 2015-01-08 06:42:44 +01:00
printsupport Remove extra ';' after QPrint namespace block 2015-01-08 01:06:07 +01:00
sql QODBC: fix converted string values empty SQLServer 2012 2014-12-30 23:55:51 +01:00
testlib Also search current directory in QFINDTESTDATA 2014-12-19 16:00:59 +01:00
tools qdoc: Fixed broken TOC links to Reimplemented sections 2014-12-19 08:07:55 +01:00
widgets Remove redundant code 2015-01-07 09:57:21 +01:00
winmain Merge remote-tracking branch 'origin/5.3' into 5.4 2014-08-12 13:05:02 +02:00
xml Remove old Trolltech feature string from QXmlSimpleReader docs 2014-10-20 11:24:59 +02:00
src.pro Add missing host_build CONFIG for qlalr 2014-11-25 20:26:53 +01:00