diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 11:56:40 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-23 08:35:33 +0000 |
| commit | 06d5870306c1b58823ebaae294bc67a458ce87aa (patch) | |
| tree | 322de02037ac3c844ccd4c301dd829bb47c3e7c4 /src/core/config | |
| parent | 5b909c1fe56f1de48fed1031a030771087d8ab22 (diff) | |
Adjust webengine to the qtConfig() changes in qtbase
Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/linux.pri | 10 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index a71d36c53..5e04701a0 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -35,12 +35,12 @@ use?(nss) { gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += v8_no_delete_null_pointer_checks=1 -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 +qtConfig(system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 +qtConfig(system-png): GYP_CONFIG += use_system_libpng=1 +qtConfig(system-jpeg): GYP_CONFIG += use_system_libjpeg=1 +qtConfig(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 +!qtConfig(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 diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index ff86aea70..46dc6931a 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -17,7 +17,7 @@ GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\" # Gyp's parallel processing is broken on Windows GYP_ARGS += "--no-parallel" -contains(QT_CONFIG, angle) { +qtConfig(angle) { CONFIG(release, debug|release) { GYP_ARGS += "-D qt_egl_library=\"libEGL.lib\" -D qt_glesv2_library=\"libGLESv2.lib\"" } else { |