diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-01-19 13:10:02 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-02-02 11:35:47 +0000 |
| commit | abd581ac76131f1bb3d6c9699930ded81936a834 (patch) | |
| tree | 7c5a278d2e1abca2da1234f8eab8c7daf7487ba5 | |
| parent | b5d7ec9226eee41d9c3516bf51dc48c283e8b13e (diff) | |
Switch linux desktop builds to gn
Updates chromium:
1fd9f11 Remove linking with libatomic
fa90180 Fix missing dependency on libffi
b5a3338 Fix broken unit test for gn
70ea2bc Fix gn compilation for rhel6.6, rhel7.2
f408e89 Improve .pri output
492b20a Remove gtk2 dependency in tests
42e3484 Allow Service Workers without HTTP headers
7a1be30 Do not require gnome-keyring
11e5c2d Revert "Add mus and catapult project files"
891fb3a Remove various test and telemetry dependencies
ddd6053 Do not use last_commit_position for gn build
e85719e Windows and macOS GN integration
8fda2ae Make more features configurable
93db377 [Backport] Don't schedule wholeSubtreeInvalid sets
[ChangeLog] Switch linux desktop builds to gn
Change-Id: I0f766b9ee9ea65a2f92d9818ea5fb34a2e65c52d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| 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 { |