diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-23 14:22:16 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-23 14:23:34 +0000 |
| commit | 427e5bc2d49ea4422eafbcd316c88d0713ac6ea8 (patch) | |
| tree | 3b6a7ad75cc432a684a42ce88a1b9623640d7a7a /src/core/config/linux.pri | |
| parent | 5181419f88990d698d0b9e5bf6cf07260ceb5e53 (diff) | |
Revert "Fix build with freetype2 depending on harfbuzz"
We should trust the global Qt configuration, the same issue
should have been solved in qtbase already. This fixes
RedHat builds where FreeType2 reports a wrong version.
This reverts commit 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c.
Change-Id: I662105521b277585c83335e20831692f990e4dc1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 7f269245e..8d736d0c1 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -27,9 +27,9 @@ GYP_CONFIG += \ contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 +contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 -use?(system_harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 use?(system_libevent): GYP_CONFIG += use_system_libevent=1 use?(system_libwebp): GYP_CONFIG += use_system_libwebp=1 use?(system_libsrtp): GYP_CONFIG += use_system_libsrtp=1 |