diff options
author | Michal Klocek <michal.klocek@qt.io> | 2019-02-21 13:44:22 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2019-02-21 16:05:11 +0000 |
commit | aeb79fea328b532aeabb5f22cb89d6bbaf801d86 (patch) | |
tree | 9bb2665eb266162d40ef5dc9426b1fb7ac367c1d /src | |
parent | 3e9cf092689dcd85bf5a5709eab6cbd2785b42b8 (diff) |
Do not pass ar to gn, update Chromium
qmake does not have cross specs archiver definition,
so do not pass it.
Updates Chromium:
29a45e8b7f Fix not working ar on windows
c2a58ec0a9 Fix builds with no xrandr
76b0b85ab0 Disable download and print buttons in PDF viewer
fa79a21c87 Fix extensions build for Windows on 71-based
6c56c89f1a Bypass CHECK for uninitialized resources when destroying plugin host
Change-Id: I45eb7ab7fb3d9e8d9346559fdd7607bbac83675b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
m--------- | src/3rdparty | 0 | ||||
-rw-r--r-- | src/buildtools/gn.pro | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject bb8520a5b4a49085e38b70cb4c95baf75ea374e +Subproject 29a45e8b7f5ddd792eb1e8a0332f68a68b08c2c diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 7766af075..8151ca8ee 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -20,7 +20,7 @@ build_pass|!debug_and_release { gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ - --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\" + --ld \"$$which($$QMAKE_LINK)\" message($$gn_configure) !system("$$pythonPathForSystem() $$gn_configure") { error("GN generation error!") |