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/core_module.pro | |
| 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/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 3b9dab457..65e46dcec 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -40,9 +40,9 @@ win32-msvc* { # and doesn't let Chromium get access to libc symbols through dlsym. CONFIG -= bsymbolic_functions -contains(QT_CONFIG, egl): CONFIG += egl +qtConfig(egl): CONFIG += egl -linux: contains(QT_CONFIG, separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)" +linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)" REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack # Duplicated from resources/resources.gyp @@ -58,7 +58,7 @@ resources.files = $$REPACK_DIR/qtwebengine_resources.pak \ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat !debug_and_release|!build_all|CONFIG(release, debug|release) { - contains(QT_CONFIG, qt_framework) { + qtConfig(framework) { locales.version = Versions locales.path = Resources/qtwebengine_locales resources.version = Versions @@ -83,7 +83,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat } } - !contains(QT_CONFIG, qt_framework):!force_independent { + !qtConfig(framework):!force_independent { # # Copy essential files to the qtbase build directory for non-prefix builds # |