summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-01-19 13:10:02 +0100
committerMichal Klocek <michal.klocek@qt.io>2017-02-02 11:35:47 +0000
commitabd581ac76131f1bb3d6c9699930ded81936a834 (patch)
tree7c5a278d2e1abca2da1234f8eab8c7daf7487ba5 /tools
parentb5d7ec9226eee41d9c3516bf51dc48c283e8b13e (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>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf1
1 files changed, 1 insertions, 0 deletions
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 {