diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-26 22:17:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-26 22:17:18 +0100 |
| commit | 3ec12c0b43f885f85427743c03fe099ffed56fc0 (patch) | |
| tree | 0cb3f75b99836b479d99a8ccc8fd8dcc369b8dea /src/core/core_module.pro | |
| parent | 1d5c00fde1d2263dd74f2bdc8590783057ec853e (diff) | |
| parent | 8947dc6902bfd2a8acd31b8c894407bf6a12695b (diff) | |
Merge branch '5.14' into 5.15
Conflicts:
src/3rdparty
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
Change-Id: Idbc9d3b06c0052a721c974fbcbfa3164faaead14
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 4b9268e1a..d7e2ab8da 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -107,7 +107,7 @@ resources.files = $$REPACK_DIR/qtwebengine_resources.pak \ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat -!debug_and_release|!build_all|CONFIG(release, debug|release) { +!qtConfig(debug_and_release)|!qtConfig(build_all)|CONFIG(release, debug|release) { qtConfig(framework) { locales.version = Versions locales.path = Resources/qtwebengine_locales @@ -146,7 +146,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat } } -!build_pass:debug_and_release { +!build_pass:qtConfig(debug_and_release) { # Special GNU make target that ensures linking isn't done for both debug and release builds # at the same time. notParallel.target = .NOTPARALLEL |