diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-02-25 08:53:43 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2011-03-16 09:38:50 (GMT) |
| commit | 5ba2675a33922cdd4ccef7de968e77b05bc1d556 (patch) | |
| tree | 72e8995cbe52356ebe20fa534a16c9909ca32547 /src | |
| parent | 3ed39aceda261d7c6b247d39cafff5931b168e07 (diff) | |
| download | Qt-5ba2675a33922cdd4ccef7de968e77b05bc1d556.zip Qt-5ba2675a33922cdd4ccef7de968e77b05bc1d556.tar.gz Qt-5ba2675a33922cdd4ccef7de968e77b05bc1d556.tar.bz2 | |
Compile.
Respect the system-zlib QT_CONFIG setting.
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/basicunix.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri b/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri index 21aedba..da4698d 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri +++ b/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri @@ -73,7 +73,11 @@ contains(QT_CONFIG, freetype) { $$QT_SOURCE_TREE/src/3rdparty/freetype/src \ $$QT_SOURCE_TREE/src/3rdparty/freetype/include - DEFINES += FT2_BUILD_LIBRARY FT_CONFIG_OPTION_SYSTEM_ZLIB + DEFINES += FT2_BUILD_LIBRARY + contains(QT_CONFIG, system-zlib) { + DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB + } + } else:contains(QT_CONFIG, system-freetype) { # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) |