diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-24 10:40:08 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-24 10:40:08 +0200 |
| commit | 5dd44f34a58b966ddc374d828b1979b9c689b1b5 (patch) | |
| tree | c9beec83e2454bc7d001bdc116620b3cc323d7a4 /src/core/config | |
| parent | 57363264cd0ff4b2f45f5344e18436fe419e2e95 (diff) | |
| parent | b73e4ce6f7cfe35a85b9a41e1a5ab36783e5edb0 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/3rdparty
src/core/core_chromium.pri
tests/auto/quick/qmltests/BLACKLIST
tests/auto/quick/qquickwebengineview/BLACKLIST
tests/auto/widgets/qwebenginepage/BLACKLIST
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
tests/auto/widgets/qwebengineview/BLACKLIST
Change-Id: I11b26f5eebde29c4c62247b90e11e3ae40789fe4
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 4 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index dea904ef8..edebdb33c 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -127,3 +127,7 @@ qtConfig(webengine-kerberos) { } else { gn_args += use_kerberos=false } + +ccache { + gn_args += cc_wrapper=\"ccache\" +} diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 40bc0b73c..998aedc40 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -180,7 +180,7 @@ host_build { } !packagesExist(libpci): gn_args += use_libpci=false - qtConfig(webengine-system-x11): hasX11Dependencies() { + qtConfig(webengine-ozone-x11) { gn_args += ozone_platform_x11=true packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true } |