summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Do not import README.chromium files without license / source codeKai Koehne2018-10-181-2/+5
| | | | | | Task-number: QTBUG-69365 Change-Id: Ifa11a5fa1fa9be89699497650158536c3271e265 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update Chromiumv5.12.0-beta1Allan Sandfeld Jensen2018-10-021-1/+1
| | | | | | | | | | | | | | | Changes: 8e6f5751e5 Restore media::FFmpegGlue::InitializeFFmpeg() 0c8d188f16 Add x86 target support for gn 2a52817b6e Fix creation of 'x86' toolchain in gn 3a84c2a8bc Add support for modules limiting jumbo width c69fdae9c7 BASELINE: Update Chromium to 69.0.3497.113 3a783ba38b Merge remote-tracking branch 'origin/upstream-master' into 69-based a4ecaddc7c Remove missing symlink to gen from perfetto/ui/src 3f8994c671 [Backport] Use newer GrGLFunction based on templated function types rather than pointers. Change-Id: Ibfe810c1c9b88e25e9093fbb2aa213249f1a77bf Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* General adaptations for Chromium 69Allan Sandfeld Jensen2018-09-222-2/+3
| | | | | Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Adapt to new GN submoduleAllan Sandfeld Jensen2018-09-222-0/+29
| | | | | | Change-Id: I3980634a1029479ab944b2e03f12a02d0c77d0c1 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Adaptations for Chromium 68Allan Sandfeld Jensen2018-09-222-3/+6
| | | | | | Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu> Change-Id: I805246b6f01cb151fff48588744408c676d87c14 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Adaptations for Chromium 67Allan Sandfeld Jensen2018-06-263-3/+4
| | | | | Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations for Chromium 66Allan Sandfeld Jensen2018-06-261-2/+2
| | | | | Change-Id: Iee88721a50036d4ef85a23dd1708d4fb84218708 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Basic adaptations for 65-basedAllan Sandfeld Jensen2018-03-153-11/+27
| | | | | Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Basic adaptations for 64-basedAllan Sandfeld Jensen2018-03-154-8/+10
| | | | | Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add support for registerProtocolHandlerJüri Valdmann2018-02-131-0/+3
| | | | | | | | | | | | | | | | | | | Extend initialization of URLRequestContextGetterQt to create a content::ProtocolHandlerRegistry for each content::BrowserContext and add the registry's URL request interceptor to the front of the interceptor chain. Implement methods in WebContentsDelegateQt to add/remove protocol handlers to/from the ProtocolHandlerRegistry. Add permission request signal and classes for core, quick and widgets. Add widgets autotest. Add signal handlers to quicknanobrowser and simplebrowser. Task-number: QTBUG-62783 Change-Id: I808e7eb9a1cb4d7216686deed4895de14fe46310 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 63Allan Sandfeld Jensen2018-01-252-4/+8
| | | | | Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 62Allan Sandfeld Jensen2018-01-251-2/+2
| | | | | Change-Id: I49cd3c419d4dd1180144c3c07bdd9a628ab73caa Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Update ChromiumAllan Sandfeld Jensen2017-11-241-1/+1
| | | | | | | | | | | | | Changes: 469bce1cfb Optionally unbundle OpenH264 7cd9b9caad Disable all gpu features usage when using nouveau 951acdd317 Fix most warnings about nested else 69f24bbea4 Fix assert with devtools 2fa8f2d847 Use default MessageLoop type for NetworkConfigWatcherMac thread 4368c73808 Fix of build-time race conditions Change-Id: I1654aaa8233411421017adfcdd1d1e5ebf74d477 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Adaptations to 61-basedAllan Sandfeld Jensen2017-10-252-3/+12
| | | | | Change-Id: I5cb198445f283c6cea8187a1a2883896df0ee918 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2017-09-291-38/+25
|\ | | | | | | Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
| * Fix invalid copyright header for windeployqt-examples.pyKai Koehne2017-09-201-38/+25
| | | | | | | | | | | | Task-number: QTBUG-60006 Change-Id: I17a4c91bca3b1c774810405bc0ecffd7165b9d73 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update 3rdpartyAllan Sandfeld Jensen2017-09-122-4/+7
| | | | | | | | | | | | | | Updates Chromium to 60.0.3112.116 and Ninja to 1.8.2 Change-Id: I46f6fe4083f338890ad85437404a442aa7eeba81 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Adaptations for Chromium 60Alexandru Croitor2017-09-111-2/+2
| | | | | | | | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Adaptations for Chromium 59Allan Sandfeld Jensen2017-09-111-2/+2
| | | | | | | | | | Change-Id: I472053e316bfa782d0a6fb8903f4901be12247ae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devAllan Sandfeld Jensen2017-08-141-0/+1
|\| | | | | | | | | | | Includes sha1 bump of src/3rdparty to head of 58-based. Change-Id: I37743c3979c1b6fb21f71eab7048e82f7aa5d78b
| * Remove third_party/afl from Chromium snapshotKai Koehne2017-07-191-0/+1
| | | | | | | | | | | | Task-number: QTBUG-61954 Change-Id: I681f7adaab1e0ef1ec162fa98c4a70569e8c3948 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Simple adaptations for Chromium 58Allan Sandfeld Jensen2017-06-141-2/+2
| | | | | | | | | | Change-Id: I7c2c85973b03fdbd2eafb5339f33a3758d53e924 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Adaptations for Chromium 57Allan Sandfeld Jensen2017-06-142-2/+7
|/ | | | | Change-Id: Ia2756c1e9b13839c2330bd98cf953d47cbdac0dd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-0216-1118/+0
| | | | | | | | | | The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix macOS deployment target to match the one in Qt CoreAlexandru Croitor2017-04-281-3/+0
| | | | | | | | | | | The minimum required macOS deployment target in Qt 5.9 is 10.10. This should be passed on to Chromium, rather than hardcoding the value to 10.7, which was used in pre-Qt 5.6 days to actually require a higher version than Qt Core used at the time. Task-number: QTBUG-60438 Change-Id: Id2ae47f467f8cc92403c1cd7a467335ebbba4e8e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Make python2 usage more robustJoerg Bornemann2017-04-271-20/+19
| | | | | | | | | | | | | | | | | | | | After configuring Qt there will be an error message if a suitable python version could not be found. Add python2 configure test that - first looks for python2 in PATH - then looks for python in PATH - checks the Python version - stores the result in QMAKE_PYTHON2 Use $$QMAKE_PYTHON2 everywhere where we call python. Pass $$QMAKE_PYTHON2 to gn for its exec_script feature. Task-number: QTBUG-60164 Change-Id: I33de1273cbd20a787b3c8889d35280784dbcd5ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove unused qmake functions and helper scriptsJoerg Bornemann2017-04-213-76/+0
| | | | | Change-Id: I8d59ccc5967193db55ac00410f09506a3b040dfe Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove unused gyp_generator.prfJoerg Bornemann2017-04-211-160/+0
| | | | | Change-Id: I0970ee56d134be2e5186cbe14466e9739d5c6b1a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fixup libxml with ICU detectionv5.9.0-beta3Allan Sandfeld Jensen2017-04-211-3/+3
| | | | | | | | | The expression was not working, and didn't match what had been tested against. Task-number: QTBUG-60211 Change-Id: Id62e53fb2bf6483c58fd22c2745a4d1b5f141b1c Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Do not use system libxml if not ICU capableAllan Sandfeld Jensen2017-04-061-1/+8
| | | | | | | | | | | Using a libxml without ICU capability will break some websites, so better fall back to bundled libxml in that case. Task-number: QTBUG-59094 Change-Id: Ia24c4045ed9eb9731367cca07d8467ea9b785f2e Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Make optimize for size a visible configurable optionAllan Sandfeld Jensen2017-04-051-3/+2
| | | | | | | | Can be enabled with --optimize-for-size and is enabled by default for embedded builds. Change-Id: I955fa57804c8b7e80bb82deb83deb94a9e2a7621 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Re-enable building with gcc 4.9.1Allan Sandfeld Jensen2017-04-041-4/+0
| | | | | | | | | The code that gcc 4.9.1 stumpled on was rewritten in Chromium 56, so we should try and let compiler build webengine again. Change-Id: I9ccec7e93aaa384aefdf338e3822b78e0dc494f2 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Require VS 2015 update 3 or higherAllan Sandfeld Jensen2017-03-273-0/+43
| | | | | | Change-Id: I7443f28ee75aa855d2c6cce237562acd7daacf43 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Adaptations for Chromium 56Allan Sandfeld Jensen2017-03-271-2/+2
| | | | | Change-Id: I78240d7956de4716757761fc6517f031b4adb822 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove blacklists of old glib and gcc 4.8 debug buildsAllan Sandfeld Jensen2017-03-262-9/+6
| | | | | | | | | | | | | We never saw the same failure with gcc 4.8 debug builds with 55-based, and the other failure suspected to related turned out not to be and have been fixed. So try to re-enable gcc 4.8 debug builds, and other old platforms but explicitly disable gcc 4.9.1 which fails to compile Chromium. Change-Id: Ib0a8ac33aafbd12d31e374dfd23f056b4ba1adf0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Create v8_snapshot gn toolchain from one pro fileAllan Sandfeld Jensen2017-03-251-0/+4
| | | | | | | | | | Merge the generation of the v8_snapshot toolchain back to being made in configure_host.pro. This is a lot cleaner and safer against errors, to make it work however we need to cache the target archicture so that it is still available with option(host_build) enabled. Change-Id: Iefed9c97528f8ce338e7a0d4fe5c6884fb4ef4bd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-222-182/+2
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Turn off MSVC warnings about unused variables/parametersJoerg Bornemann2017-03-221-0/+2
| | | | | | | This is consistent with what we do for gcc/clang. Change-Id: Ibda94dbc0c506c4a8053e0e3b2da25fa7dbed3a8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix OpenGL for embedded buildsAllan Sandfeld Jensen2017-03-201-4/+11
| | | | | | | | Sets the external ozone platform and make sure we don't set bad QT_LIBDIR defines for libEGL and libGLESv2 when not doing cross builds. Change-Id: I60eada3c93224a3aa3a105b007d669932516d331 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Move opus, webp and ffmpeg to new configure systemAllan Sandfeld Jensen2017-03-081-14/+26
| | | | | | | | Use the new configure system to control if we are using system opus, webp and ffmpeg libraries. Change-Id: I53db66ca1668fc939a51bf7811f967468456b924 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9Allan Sandfeld Jensen2017-03-041-1/+13
|\
| * Merge remote-tracking branch 'origin/5.8' into 5.9Allan Sandfeld Jensen2017-03-021-1/+13
| |\ | | | | | | | | | Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61
| | * Fix MSVC version detectionJoerg Bornemann2017-02-141-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not check for exactly MSVC version 14.0 but compare if the actual version is less than the requested version. Task-number: QTBUG-58826 Change-Id: I249ed3c697ccb911784a83463b1c23185c9b3856 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Make xscrnsaver optionalAllan Sandfeld Jensen2017-03-021-1/+1
|/ / | | | | | | | | | | | | | | Allow building on machines where xscrnsaver is not present, but turning of the corresponding features. Change-Id: Iabf7063fcc25f68f5a9fefc95a1caf164da49fed Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Support cross-builds and alternative compilers with GNAllan Sandfeld Jensen2017-03-012-2/+20
| | | | | | | | | | | | | | | | Adds GN versions of the gyp_configure targets, to create custom toolchains we can use to override compilers used by GN. Change-Id: Ic3a9cb7e83f845180396faff632f72f9c24f3365 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Simple adaptations to Chromium 55Allan Sandfeld Jensen2017-03-015-23/+28
| | | | | | | | | | | | | | The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Block debug builds with GCC 4.8Allan Sandfeld Jensen2017-02-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | Skia does not mark inline functions used in optional arch cpp files with always_inline, which means they can be un-inlined and end up as in the object files where the linker will pick one at random without knowing some of them are compiled with optional arch features. Task-number: QTBUG-59154 Change-Id: I8495e04550898b093ab39c4dc0f37ad6e8948864 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fix linkage of WebEngineCore library in gn buildPeter Varga2017-02-091-2/+4
| | | | | | | | | | Change-Id: I7ed79693cd87cd649bb8d6bea6b1397a9f6350c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Switch mac builds to gnMichal Klocek2017-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Updates chromium: cd3417b Override xcode min version to 0721 d67d4bb Remove pending messages DCHECK to stop certain tests from crashig [ChangeLog] Switch mac builds to gn Change-Id: I78111bd931f43ceb6e28d67da73f6fb2b2051c9b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Refactor release and debug handlingMichal Klocek2017-02-062-28/+9
| | | | | | | | | | | | | | | | | | | | Fix release and debug builds. Refactor ninja and gn builds as a sub projects, these are only build as release. Call core_generator and gn_run separately for debug and release builds. Change-Id: I638023214cdc98a5101d190486452cc4a1229486 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>