summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Fix build with freetype2 depending on harfbuzzAllan Sandfeld Jensen2015-10-121-2/+5
| | | | | | | | | | | | | | | | | | Chromium uses system freetype2 by default but not harfbuzz by default, since some newer versions of freetype2 depends on harfbuzz, we need to configure Chromium to use system harfbuzz in those cases. Change-Id: Ic15abe85c5b7e5ef1c3d82420efbc8605c2fe1ae Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Clean up configure syntaxAllan Sandfeld Jensen2015-10-122-15/+19
| | | | | | | | | | | | | | | | Imports use? qmake macro from QtWebKit and use it to make checks simpler and keep the webengine config in WEBENGINE_CONFIG. Change-Id: Ic0f1fca45ebc292d8146107697f9d3ca3764dfb4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Make NSS vs BoringSSL choice more flexibleAllan Sandfeld Jensen2015-10-121-2/+15
| | | | | | | | | | | | | | | | Make the NSS library optional on Linux to reduce the hard coded difference between embedded and desktop builds. Change-Id: I3d7f703ead0ff325ffd2ae272e7e4c2d5258fc25 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove hard dependency on libjpeg on Linux.Michael Brüning2015-10-121-1/+0
| | | | | | | | | | | | | | | | It made the build fail on systems that use libjpeg-turbo. Task-number: QTBUG-48606 Change-Id: I1aa6acab1627d3f4613b4ca39837b6deb25d3cc0 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-081-5/+12
|\| | | | | | | Change-Id: I1ac58ada3f32821d62d49e5fcb12546aa9e75fb4
| * fix python version checkJoerg Bornemann2015-10-061-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The python code that is used to determine the version number did not work with python3. In python3 print is a real function and must be called as such. Use positional accessors to be compatible with python < 2.6. Also extend the error message for users that attempt the build with python3. Task-number: QTBUG-48507 Change-Id: I49e1fb77c2cc421ac1faed8d8143bf605fbde700 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update to Chromium 45.0.2454.101Allan Sandfeld Jensen2015-09-302-1/+2
| | | | | | | | | | Change-Id: Ifda982e1bcfc2a0655e65a71321b137a348be865 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix khr autotest to work with non-standard locationsLaszlo Agocs2015-09-251-0/+4
| | | | | | | | | | | | | | | | | | Just like the egl autotest in qtbase does, the paths have to be added from the respective QMAKE variables, otherwise the test will never pass on systems where EGL and friends are installed in a non-standard location. Change-Id: Idaa2136b5574f6f320abb8a7074350b5838b402e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Joerg Bornemann2015-09-242-3/+9
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2015-09-242-3/+9
| |\| | | | | | | | | | Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
| | * enable OS X 32 bit buildJoerg Bornemann2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48228 Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Fix dos2unixVersion error handling in take_snapshotMichal Klocek2015-09-241-1/+4
|/ / | | | | | | | | | | | | | | | | dos2unix version 6.0.4 do not report version number on stdout, but to stderr, which breaks processing. Assume in that case that we have too old version anyway. Change-Id: Ifc945979a088558593091a8ef6b1a74e07334b66 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add more required pkg-config packagesAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | | | | | | | | These packages are required if Qt was build against them. Change-Id: I2b664229485dd764617d1683647951ab600768ed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update dependenciesAllan Sandfeld Jensen2015-09-182-9/+13
| | | | | | | | | | | | | | | | Add more pkg-config based libraries that we need to build Qt WebEngine and update Chromium SHA so that we do not need ATK. Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Unite commmon linux platform configurationAllan Sandfeld Jensen2015-09-101-5/+0
| | | | | | | | | | | | | | Move duplicated linux configuration to linux.pri Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Enable building linux-clang platformAllan Sandfeld Jensen2015-09-071-1/+1
| | | | | | | | | | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 17:31:44 +0000