diff options
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/desktop_linux.pri | 3 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 0fa2e061c8209c544f461961fae6887b7a22e3b +Subproject 1fd9f11a2dc1ef7cf52c2a631ca0e9b9921bc75 diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index e8db4248f..f2ea4883a 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -3,7 +3,8 @@ include(linux.pri) use?(gn) { gn_args += \ is_clang=false \ - use_sysroot=false + use_sysroot=false \ + use_system_libffi=false use?(icecc) { gn_args += use_debug_fission=false diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 48a1eb263..98b11c40a 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -35,6 +35,7 @@ defineTest(runConfigure) { } isQtMinimum(5, 9) { qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code + linux: !cross_compile: use_gold_linker: WEBENGINE_CONFIG += use_gn } linux { |