| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \ |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ibce28bfce855942b8c5675b6e34c85d837cb6255
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Search for protobuf library and compiler, and use them if found.
Change-Id: I310eca661ed2dda14349e84a6769d2ae79ffb7c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
xcopy seems to behave differently for than cp when copying
directories recursively.
Change-Id: I5130a0642511fb796d9b32e0d4cd2cd2b9153dc0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | | |
Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
|
| |\|
| | |
| | |
| | | |
Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | | |
Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| |
| |
| |
| | |
Updating to Chromium 47 and adapting API.
Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib7f9af5784a5e57767e70a1aa580a98d75e129be
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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 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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I1ac58ada3f32821d62d49e5fcb12546aa9e75fb4
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-48228
Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
These packages are required if Qt was build against them.
Change-Id: I2b664229485dd764617d1683647951ab600768ed
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Adds configure check and configures chromium to use system libsrtp if
available.
Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|