summaryrefslogtreecommitdiff
path: root/Source/ThirdParty
Commit message (Collapse)AuthorAgeFilesLines
* Import WebKit commit e89cea5f01479652674d3c24b2f387eb0987d0a1Konstantin Tokarev2017-10-2060-11085/+8856
| | | | | Change-Id: Ifc00865ceeb5b83b7990f91af7dbbd1a05df1c30 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-021-3/+3
| | | | | Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3Konstantin Tokarev2017-02-0217-616/+769
| | | | | Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-0249-1/+19774
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-021136-116452/+169693
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Fix out-of-source build with MSVCThiago Macieira2015-09-301-0/+7
| | | | | | | | | MSVC does not search the same directory as the source file, so we need to give the correct -I flags so #include "xxx" will work. Change-Id: I42e7ef1a481840699a8dffff14084870461dbc47 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Allan Sandfeld Jensen2015-05-291-1/+1
|\ | | | | | | Change-Id: Iceb5c402acfd83632007cb5f7673b4d6cda08e6b
| * Support MSVC 2015Allan Sandfeld Jensen2015-05-291-1/+1
| | | | | | | | | | | | | | | | | | Fixes building qtwebkit with MSVC 2015 Change-Id: I94b085ab822b3cdfa911814467e051c11c93d79e Task-number: QTBUG-46344 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-163-3/+3
|/ | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Icc6f774c9ca37ea88ac024163386b16fc50fb2a7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix build of leveldb with old Qt versionsAllan Sandfeld Jensen2014-11-032-4/+10
| | | | | | | | Applies a missing patch to leveldb that fixed building with older Qt versions. Change-Id: Ie894127d265140cbb8524e271e5779c92ab8e393 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Use compiling_thirdparty_code instead of disabling specific warningsAllan Sandfeld Jensen2014-09-182-9/+2
| | | | | | | | | | Instead of disabling all the extra warnings that appear in third-party libraries we should just use the already existing build config to avoid adding all the extra WebKit warning flags when building those libraries. Change-Id: I809b7f51a992f0314e2f5983008bc3b4b580c68e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix non production_build buildsAllan Sandfeld Jensen2014-08-161-0/+2
| | | | | | | | | Merges upstream r156535 fixing force_static_libs_as_shared and new build issue added, and a number of warnings that prevents building with -Werror. Change-Id: Ie8f96fa93bc808b2c8c45850fe2951678235cfac Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix WebView crash when using gcc 4.9.Sergio Martins2014-06-251-1/+2
| | | | | | | | Fix copied from https://code.google.com/p/angleproject/issues/detail?id=651 Task-number: QTBUG-39723 Change-Id: I8ee694079c263bf6d21e2a0eadc2234a2c69cae2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix build with gcc 4.4Allan Sandfeld Jensen2014-06-241-2/+4
| | | | | | | | | | Gcc 4.4 does not have the unused-but-set-variable warning flag and fails when building leveldb which tries to set it. This patch only sets it on gcc versions that supports it. Change-Id: Iea4fb5bab062729fc0518d644122f13502967cfb Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix build with clang on linuxAllan Sandfeld Jensen2014-04-231-1/+1
| | | | | | | Fixes a few issues with clang builds using libstdc++ Change-Id: I68d3af2c48bce42e2c5319c517e9b57bed2b729a Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix compilation: missing typedef for uint32_tThiago Macieira2014-04-021-0/+1
| | | | | | | status.cc:12:3: error: ‘uint32_t’ was not declared in this scope Change-Id: Id6ea656937f8db39976603a504bcdd0c7559e488 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compiler warnings when building Qt WebKitAllan Sandfeld Jensen2014-03-181-0/+5
| | | | | | | | Fix warnings about C++11 violating syntax, unused variables in leveldb and non anynomous classes deriving from anonymous ones. Change-Id: I39326eed03fabe2856f1ea7c93eff65f30ee78ee Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Implement Qt port for for leveldbAllan Sandfeld Jensen2014-03-066-10/+632
| | | | | | | | Replace the pthread/posix port classes in leveldb with a Qt port. This should enable us to use leveldb on all Qt platforms. Change-Id: Ie467f1c23ac28c436d26fb8fdc06c09ce70aff7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Use WebKit's copy of leveldb when system version is not availableAllan Sandfeld Jensen2014-02-053-0/+140
| | | | | | | | | To support indexed database webkit needs leveldb, therefore webkit contains a copy of leveldb which we can use to provide support when the system doesn't ship with a suitable version. Change-Id: I231694e6a7c7cb83855bfed3f9ee24fbd2795362 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix build with clangAllan Sandfeld Jensen2013-09-191-2/+0
| | | | | | | | | | | | | | Forcing C++11 on clang does not work on older versions of clang. Instead fix https://bugs.webkit.org/show_bug.cgi?id=115741 by disabling rvalue references if clang is using a too old version of libstdc++11. Avoid compile_asserts unless we have the same C++11 static asserts used in trunk. Finally build ANGLE with the same C++11 state as the rest, otherwise it will expect libstdc++ symbols instead of libc++ symbols. Change-Id: Ifa49325a73d6dc17bc67bccd79813b25860df915 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Import Qt5x2 branch of QtWebkit for Qt 5.2Allan Sandfeld Jensen2013-09-19907-66090/+68319
| | | | | | | Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* ANGLE doesn't build with bison 3.0Allan Sandfeld Jensen2013-08-161-0/+1
| | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119798 Reviewed by Antti Koivisto. Make glslang.y compatible with bison 3.0 by using %lex-param to set YYLEX_PARAM. * src/compiler/glslang.y: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-32913 Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Qt][Mac] Linking fails with Qt 5.1Andras Becsi2013-04-111-0/+2
| | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=114435 http://trac.webkit.org/changeset/148204 Reviewed by Tor Arne Vestbø. Qt 5.1 enables C++11 by default when using clang on Mac and links against the libc++ standard library. As a result building the QtWebKit shared library fails when linking agains the ANGLE intermediate static library because libc++ misses some symbols needed by ANGLE. Disable C++11 for the ANGLE intermediate library to fix the build. Change-Id: If5b2ef9242e7c4edc55eec50b64fbb1717217a59 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 ↵Simon Hausmann2012-11-077-204/+78
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
* Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 ↵Simon Hausmann2012-10-2213-3/+276
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets
* Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 ↵Simon Hausmann2012-09-149-9/+160
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128608) New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make
* Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d ↵Simon Hausmann2012-09-1022-3476/+3746
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot
* Imported WebKit commit bf0b0213bbf3886c96610020602012ca7d11b084 ↵Simon Hausmann2012-08-242-1/+9
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@126545) New snapshot with clang and python build fixes
* Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 ↵Simon Hausmann2012-08-216-0/+16
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@126147) New snapshot including various build fixes for newer Qt 5
* Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67 ↵Simon Hausmann2012-07-18130-9392/+15489
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@122948) New snapshot that should fix the rendering issues recently introduced
* Imported WebKit commit 953baa67aa07087b6ecd4199351ec554c724e27d ↵Simon Hausmann2012-07-163-30/+29
| | | | (http://svn.webkit.org/repository/webkit/trunk@122676)
* Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 ↵Simon Hausmann2012-07-113-2/+19
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@122325) New snapshot that should work with the latest Qt build system changes
* Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc ↵Simon Hausmann2012-06-252-1/+12
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@121147) New snapshot that includes Win32 debug build fix (use SVGAllInOne)
* Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b ↵Simon Hausmann2012-05-0787-1103/+9008
| | | | (http://svn.webkit.org/repository/webkit/trunk@116286)
* Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a ↵Simon Hausmann2012-03-126-7/+42
| | | | | | (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
* Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 ↵Simon Hausmann2012-02-244-0/+46
| | | | (http://svn.webkit.org/repository/webkit/trunk@108790)
* Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 ↵Simon Hausmann2012-02-032-1/+21
| | | | (http://svn.webkit.org/repository/webkit/trunk@106560)
* Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 ↵Simon Hausmann2012-01-1192-6079/+8914
| | | | (http://svn.webkit.org/repository/webkit/trunk@104681)
* Imported WebKit commit 2ea9d364d0f6efa8fa64acf19f451504c59be0e4 ↵Simon Hausmann2012-01-06792-0/+170166
(http://svn.webkit.org/repository/webkit/trunk@104285)