summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Preserve paths with spaces in MOC_COMMANDKai Koehne2016-05-251-1/+1
| | | | | | | | | | | | | This fixes a problem caused by change efd2ea8ea720 in qtbase. MOC_COMMAND now can contain paths with unescaped spaces, like /us/include "/Library/Frameworks (framework directory)" Splitting this just by space will lead to a broken moc call. Change-Id: Ic2875917059141ec82cf5f66243a357ac7ee0ba3 Task-number: QTBUG-53612 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove harmful spaces in qmake argument helpKai Koehne2016-05-251-1/+1
| | | | | Change-Id: I47182d78f9dc8ecb8b4758f3ab739eaf88c04e24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7.0Michael Bruning2016-05-231-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
| * Remove fake dependencies in embedded linux buildsAllan Sandfeld Jensen2016-05-201-1/+1
| | | | | | | | | | | | | | When doing embedded Linux builds we do not use X11 libraries. Change-Id: I704d8fd4853e2187590bc9513f55b7ec61c9c4bd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove spellchecking supportMichal Klocek2016-05-061-0/+4
| | | | | | | | | | | | | | | | Spellchecking API needs a bit more reviews and love. Current API is not intuitive and partly broken. Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Provide a debug version of QtWebEngineProcessJoerg Bornemann2016-05-041-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | We never shipped a debug version of the QtWebEngineProcess executable. This is problematic in debug_and_release builds when a debug application starts the release version of QtWebEngineProcess. The Qt libraries will then be loaded twice, in debug and release. Also, in development setups where only the debug libraries are deployed, the release version of QtWebEngineProcess cannot be loaded. Task-number: QTBUG-49493 Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Get additional sanitizer dependencies from upstream chromium.Alexandru Croitor2016-05-033-37/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buildtools directory contains custom libc++ libraries, which are a second-level git submodule (the first-level being the buildtools submodule, and the supermodule being chromium itself). The init_repository.py script does not support checking out submodules recursively, thus leading to the mentioned libraries being skipped. This change adds a hardcoded addition to make sure the buildtools submodules are checked out when init_repository is run, as well as support for copying all nested files in the submodule tree, when the take_snapshot script is executed. Thus it copies all necessary sanitizer dependencies. Change-Id: Icb5cf5b52c3d0a83c4690fb7d641cee4f5dc1132 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-291-3/+3
|\| | | | | | | Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
| * Fix hint to use WEBENGINE_CONFIG+=Kai Koehne2016-04-281-3/+3
| | | | | | | | | | | | | | At least on Windows/cmd.exe you can't put spaces in the argument. Change-Id: I55767a23409403b695e225339f86daae2dea1dc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-2/+2
|\| | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Use system NSS only for certificate handlingKai Koehne2016-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update Chromium to 49.0.2623.111Allan Sandfeld Jensen2016-04-051-1/+1
| | | | | | | | | | | | | | Pulls in SHA based on updated Chromium Change-Id: I1d9125fdfa355344914dadc4eab7fef1c53dfc40 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Michael Brüning2016-03-221-0/+3
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| | * Check for presence of the qtwebengine-chromium submoduleJoerg Bornemann2016-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | People repeatedly tried to build QtWebEngine without checking out the qtwebengine-chromium submodule. Let's yield a helpful error message if the submodule isn't present. Change-Id: I9bf607e7a21e6e79c83bcd4afc81c63ae83e1ed6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Make isMinOSXSDKVersion() test reusable for different versions.Alexandru Croitor2016-03-221-12/+17
| | | | | | | | | | | | | | | Change-Id: Ibce28bfce855942b8c5675b6e34c85d837cb6255 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add option to allow compiling WebEngine as Mac App Store compliant.Alexandru Croitor2016-03-221-0/+7
|/ / | | | | | | | | | | | | | | | | When the option is enabled, a GYP variable is set that will result in removing private API calls in Chromium. Task-number: QTBUG-51072 Change-Id: If8835ce74bf5db94c17b68ebeb396cae9cc10553 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update to Chromium 49.0.2623.91Allan Sandfeld Jensen2016-03-092-1/+2
| | | | | | | | | | Change-Id: I43c545d1600bebabf6b94209beb91b3d3c4cd244 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Require OSX SDK version of at least 10.10.3.Alexandru Croitor2016-03-081-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | Chromium 49-based uses new OSX API which was added in SDK 10.10.3. Make sure not to allow compilation in case the SDK version is lower than that. This also reverts commit 70ed3812fbe5eee6f62ddb26251f46061b0d3675 to allow compiling on OSX 10.9, with an appropriate SDK. Task-number: QTBUG-51350 Change-Id: Ib6dab0a1e16734cda9429363c90d2c8b8838d833 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Use system protobuf if foundAllan Sandfeld Jensen2016-03-081-1/+7
| | | | | | | | | | | | | | Search for protobuf library and compiler, and use them if found. Change-Id: I310eca661ed2dda14349e84a6769d2ae79ffb7c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update snapshot scripts to Chromium 49Allan Sandfeld Jensen2016-03-072-5/+10
| | | | | | | | | | | | | | | | | | The multi megabyte ICU assembler files are now omitted, as we instead either generate data files or use system ICU. Task-number: QTBUG-51173 Change-Id: I7c7594be08876751ffd73171550000a28399954f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Skip building on 32-bit windows hostsAllan Sandfeld Jensen2016-03-051-0/+12
| | | | | | | | | | | | | | | | We keep running out of memory during linking and must skip building on 32-bit architectures until that problem is solved. Change-Id: Ib0b465cb033df0112133eb256adeb498d260da7f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Require xcode 7.0 and OS X 10.10Allan Sandfeld Jensen2016-02-221-5/+5
| | | | | | | | | | | | | | | | | | We might be able to get xcode 6.0 on OS X 10.9 working with an 10.10.3 SDK, but for now we just require 10.10 and a newer xcode. Change-Id: Ibeb068e9993b3709a1fd74370d7892718a108ab1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-043-22/+35
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * winrt: Disable buildMaurice Kalinowski2016-02-021-0/+4
| | | | | | | | | | | | | | | | WinRT is not a supported platform and checks to disable the build have been removed in previous refactorings. Change-Id: I22d2a8ae28f7cfaa3b962ac353ad5c14f11771a9 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Disable WebSpeechAllan Sandfeld Jensen2016-02-011-1/+1
| | | | | | | | | | | | | | | | Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Disable printing in ChromiumAllan Sandfeld Jensen2016-01-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | Disabling printing saves us compiling those files and files off a megabyte on the debug binary. To keep all the configure options in config, the common options are moved to a shared common.pri. Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Allow build on all Linux platformsKai Koehne2016-01-261-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | Support also irregular mkspec names like linux-imx6-g++. We officially only support boot2qt for embedded Linux, but that's no reason to prevent builing on other configurations. Also, the line between embedded and Desktop Linux is blurry. Task-number: QTBUG-49249 Task-number: QTBUG-50259 Change-Id: If5b87a21bb226194c8340430be958d42ae80b537 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Adjust take snapshot to include chrome printing sources.Michael Bruning2016-02-011-1/+5
| | | | | | | | | | Change-Id: I5f6abb62c1f35c544ea8024584cccb1d8c8421da Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-02-0116-508/+325
| | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & tests are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header (in those files which will be under GPL 3 with exceptions) Change-Id: I59fcbb8cd1ca42b1a5ef96577bcb35ea0af01b71 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-121-2/+6
|\| | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * Merge remote-tracking branch 'origin/5.5' into 5.6Michael Bruning2015-12-091-2/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
| | * Fix ninja for shadow builds on windows.Michael Bruning2015-11-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | xcopy seems to behave differently for than cp when copying directories recursively. Change-Id: I5130a0642511fb796d9b32e0d4cd2cd2b9153dc0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Switch libvpx detection to config checkAllan Sandfeld Jensen2016-01-113-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | Chromium depends on svc_context.h that isn't normally shipped by libvpx-dev packages. Change-Id: I39790add79097a4eb614873df85e32749b591fd2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Update Chromium to 47.0.2526.109Allan Sandfeld Jensen2016-01-052-1/+2
| | | | | | | | | | | | | | | | | | | | | Also pulls in the CDM component. Change-Id: Ide70c3f8872b55473d17c32de65046fb3b0ced05 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-032-9/+30
|\| | | | | | | | | | | Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
| * | Set -no-duplicate-basenameAllan Sandfeld Jensen2015-12-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add another gyp flag from gyp_chromium.py, this is needed on some non-x86 platforms in particular AArch64. Change-Id: Id9ca1490d0e8637e52cec53c40e9bc40403501f2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-201-9/+22
| |\| | | | | | | | | | Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
| | * Build ninja in the shadow build directory.Michael Bruning2015-11-191-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially makes a copy of the ninja sources to the build directory to be non-intrusive for src/3rdparty. Task-number: QTBUG-44002 Change-Id: I82a686abbfab2579462dcb57e10b16f71a3a0d4e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Update Chromium 47.0.2536.71Allan Sandfeld Jensen2015-12-012-1/+2
| | | | | | | | | | | | | | | | | | | | | Including a few missing spellcheck files. Change-Id: Idffb0f5bc4411764c4079a314b21e656f8e892e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-202-13/+11
|\| | | | | | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * | Fix cross-compile with NSS availableAllan Sandfeld Jensen2015-11-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Chromium currently can't build configure with both NSS and embedded, so we need to use OpenSSL in that configuration. Change-Id: Ia680b2865d876d4dcd4df8624b8628ff579fc649 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Update Chromium SHA1Allan Sandfeld Jensen2015-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Pulls in the lastest 45-based SHA1 Change-Id: I7111143db7697cfa3861ba26255102717d1d39e2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Check if platform is supported first.Michael Bruning2015-10-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former location of the check at the end of the function caused misleading error messages about missing features to be printed as the reason for the skipped build, when actually the whole platform was not supported by Qt WebEngine. Change-Id: Ie8ad80b8716b7212ae96ce6ed2e2ab51f396d219 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Revert "Fix build with freetype2 depending on harfbuzz"Allan Sandfeld Jensen2015-10-231-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should trust the global Qt configuration, the same issue should have been solved in qtbase already. This fixes RedHat builds where FreeType2 reports a wrong version. This reverts commit 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c. Change-Id: I662105521b277585c83335e20831692f990e4dc1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix components strings dependenciesAllan Sandfeld Jensen2015-10-301-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling localized_error needs to depend on the components strings to avoid a race-condition while building, and repack_locales needed to be updated to include them into the our locales pak. Change-Id: I3250b2bbad717f560eeaaf31d59e45167225191e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-274-12/+19
|/ / | | | | | | | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Enable building with MSVC 2015Kai Koehne2015-10-191-2/+2
| | | | | | | | | | | | | | | | | | Enable MSVC 2015 in prechecks and fix error C2308: concatenating mismatched strings Task-number: QTBUG-47541 Change-Id: Ia583e2963c7e6ef8327909b91c8df04aeb17eb07 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Check for OS X minimum version early onKai Koehne2015-10-151-4/+12
| | | | | | | | | | | | Change-Id: Ib7f9af5784a5e57767e70a1aa580a98d75e129be Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove special case for msvc2013 when checking for c++11Kai Koehne2015-10-131-1/+1
| | | | | | | | | | | | | | | | Since qtbase commit cc67960f msvc enables c++11 for MSVC 2012 and newer, too. Change-Id: If73850759bbbb107c99e2dd6e4066e15b73d8f6c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 16:00:12 +0000