diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-01-06 14:53:38 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 18:59:45 +0100 |
| commit | 76f2aa139a7276278fb962de79fcf0a94bf063df (patch) | |
| tree | b6ac3f74d5d25724403035835484b25c1f087c84 /src/platformsupport/fontdatabases/basic | |
| parent | e2a8ad145ec0b31ce78508774935f22026ceba63 (diff) | |
Fix the build of qt-freetype with -system-zlib
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 <samuel.rodal@nokia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/basic')
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/basic.pri | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |