diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-11-05 18:06:24 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-06 13:07:19 +0000 |
| commit | cadcec655e53819e891eb3c7b0155087d86b2688 (patch) | |
| tree | 2e9a8dafd2db8fe4dabdef1b41d5a6b50cd73d76 /src/core/config | |
| parent | be5a8eda40cba8a017c0044739e9347d6c6051ff (diff) | |
Apply glib usage from the Qt configuration to QtWebEngine as well.
It was previously ignored and libQt5WebEngineCore.so.5 still linked
dynamically to libglib-2.0.so
Change-Id: I0b0b128c9eb36d94af9f5f91f212d1371403adad
Task-number: QTBUG-49253
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/config')
| -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 8d736d0c1..9868d6848 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -29,7 +29,7 @@ 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 - +!contains(QT_CONFIG, glib): GYP_CONFIG += use_glib=0 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 |