summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* | 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>
* | 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>
* | Test only for KHR headerv5.6.0-alpha1Samuli Piippo2015-09-011-3/+1
| | | | | | | | | | | | | | | | | | Raspberry Pi toolchain from yocto uses older khr headers that do not include defines for KHRONOS_FALSE and KHRONOS_TRUE, but can still be used to build qtwebengine correctly. Change-Id: Ia7a6420ba142141ebb16d880f989eb56f892f1a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update to Chromium 45.0.2454.79Allan Sandfeld Jensen2015-08-262-3/+2
| | | | | | | | | | Change-Id: Id986be0af632884ae4e7d0fb2023e71c449a9eae Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Rebasing on Chromium 45Allan Sandfeld Jensen2015-08-252-5/+10
| | | | | | | | | | | | | | Fixing the minor differences needed to work with Chromium 45. Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix the build on embedded linuxAndras Becsi2015-08-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Select Visual Studio version based on mkspecKai Koehne2015-08-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7a1e0d57d1a1683442 determined the Visual Studio version based on the 'VisualStudioVersion' environment variable. While this variable is defined by the default Visual Studio command line prompt, it isn't necessarily set in other environments. Anyhow, Qt already determined the compiler/Visual Studio version in the mkspec. We can just reuse this here. Change-Id: Ibee9526e91ae855151940da6be438705de048c0c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-302-8/+6
| | | | | | | | | | | | | | Also updates snapshot script for removed, added and renamed modules. Change-Id: Ie511cbddc2f7c03d9f73f7ae190701539bc91d4d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add configurable option for using system FFMPEGAllan Sandfeld Jensen2015-07-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | Add qmake command line option to use system FFMPEG and report result and option in the configure summary. Also checks libraries FFMPEG and chromium both uses are available on the system since linking will otherwise fail. Does not check if the version of the libav libraries are correct, but leaves that to whomever enables the option. Change-Id: I39c9c47eba19a6e40872a2e9b24a9010cdea1011 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use system snappy if availableAllan Sandfeld Jensen2015-07-283-0/+49
| | | | | | | | | | | | | | Snappy doesn't use pkg-config so we use a configure check to detect it. Change-Id: I54f02d493139069ca8838f7008041340990fc016 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add post configure step and make using system ICU an optionAllan Sandfeld Jensen2015-07-273-1/+28
| | | | | | | | | | | | | | | | | | | | Adds a post configure step to test qmake arguments, summerize options, and make it possible to enable using system ICU, but leaving it default off for now. Also summerizes the proprietary codec configuration. Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use system libsrtp if availableAllan Sandfeld Jensen2015-07-193-0/+48
| | | | | | | | | | | | | | | | Adds configure check and configures chromium to use system libsrtp if available. Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Detect and use system librariesAllan Sandfeld Jensen2015-07-191-5/+16
| | | | | | | | | | | | | | | | Uses pkg-config to detect libevent, libwebp, flac, jsoncpp, opus, speex and vpx, and configure chromium to link with system versions. Change-Id: Ic6c5bbe07929a7c2b79abcb760a8c61b0c9ed92f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Update Chromium version to 44.0.2403.80Allan Sandfeld Jensen2015-07-151-2/+2
| | | | | | | | | | | | | | | | Also switch to parsing DEPS instead of .DEPS.git as the latter has been removed from upstream chromium. Change-Id: Ie449e310202458c5c514a5eb6af2d30486ec0891 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add xscrnsaver to required packagesAllan Sandfeld Jensen2015-07-021-1/+1
| | | | | | | | | | | | | | | | | | Xscrnsaver is now used for idle desktop detection on Linux, and required unless we disable that functionality from Chromium. Change-Id: I5295ebd822a4b53024d86868aa6dc4912ab120c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Unbundle zlib, minizip, libxml2 and libxslt on LinuxAllan Sandfeld Jensen2015-07-011-0/+8
| | | | | | | | | | | | | | If available use the system versions of these basic libraries on Linux. Change-Id: Iebcd5c11c53d0d491c457ccff71be04f8b2cac1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fix MSVC buildsAllan Sandfeld Jensen2015-06-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Chromium now expects the MSVS version to be set in GYP_MSVS_VERSION, so we need to set that. Fortunately we can use the VisualStudioVersion environment to do so. Note we should be setting it to "2013e" when using Express, but I can not currently detect that. Change-Id: Id51c04c8d3292c05809d4aa1301a50b12b2d57fd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Disable V8 binary blobsAllan Sandfeld Jensen2015-06-231-0/+2
| | | | | | | | | | | | | | | | | | V8 will now by default require two external binary blobs in libexec. We prefer not having to ship more external dependencies, which are both inconvinient and a security risk. Change-Id: Id171f9be83add871bfa7d76c000799ebda9b7666 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Update scripts for Chromium 44Allan Sandfeld Jensen2015-06-232-24/+22
|/ | | | | | | Updates version and snapshot script Change-Id: Ie1bd69d6a5042edbd563357bb2fc326cbbb813e8 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Partially revert "Fix QtCreator loading of qtwebengine.pro"Andras Becsi2015-04-243-4/+4
| | | | | | | | Changing the python print signature seems to cause problems on Windows, so revert it. Change-Id: I715f792b880a2269ec153bbc73b432c6a4e87cc5 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix QtCreator loading of qtwebengine.proAndras Becsi2015-04-153-4/+4
| | | | | | | | | | | | | When QtCreator loads qtwebengine.pro some parsing errors are shown if it picks up the system python3 for basic detection. Although we do not plan to support python3 with all of our scripts (since Chromium does not) these simple cases can be fixed by using the function version of python's print. This patch also adds the Chromium source path to the core INCLUDEPATH so that Chromium headers are indexed as well. Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-144-5/+3
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Enable building the QML test support API for developer buildsAndras Becsi2015-03-121-0/+1
| | | | | | | | This makes sure developers at least build this codepath so we have the needed coverage to find out if something breaks. Change-Id: Id56ecf5bb051e873e9bcf313a50a5eec23c2bd83 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 13:01:36 +0000