From 76f2aa139a7276278fb962de79fcf0a94bf063df Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 6 Jan 2012 14:53:38 -0200 Subject: Fix the build of qt-freetype with -system-zlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The static library needs to link to zlib too, so that the plugins using this library link to zlib. At runtime this doesn't make a difference because -system-zlib means QtCore is linked to zlib and the system zlib shared library was loaded, so the symbols are resolved. However, since -Wl,-no-undefined was added to the build, the plugin must link to zlib explicitly too. Change-Id: I10d6df8814e823079fee76ae6a7d5b55057c9daf Reviewed-by: Samuel Rødal --- src/platformsupport/fontdatabases/basic/basic.pri | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri index 31a416971f..5cd08fec45 100644 --- a/src/platformsupport/fontdatabases/basic/basic.pri +++ b/src/platformsupport/fontdatabases/basic/basic.pri @@ -75,6 +75,7 @@ contains(QT_CONFIG, freetype) { DEFINES += FT2_BUILD_LIBRARY contains(QT_CONFIG, system-zlib) { DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB + include($$PWD/../../../3rdparty/zlib_dependency.pri) } } else:contains(QT_CONFIG, system-freetype) { -- cgit v1.2.3