summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989wip/nextKonstantin Tokarev2017-05-0811-41/+56
| | | | | Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit a4582ff260c0683b310e8ebbd5c3e6d5ad9fccc2Konstantin Tokarev2017-05-0210-41/+49
| | | | | Change-Id: Ic5519f3eaf22b68312d410b65d70445f05c631fa Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300Konstantin Tokarev2017-04-2829-33/+299
| | | | | Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70dKonstantin Tokarev2017-04-25185-974/+5760
| | | | | Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7Konstantin Tokarev2017-04-2286-102/+11353
| | | | | Change-Id: Ife943bbbd8226afa05ef6320b10ba351d55fd797 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 1686903dfa4ab621a1b16a1a87529c88b07414a6Konstantin Tokarev2017-04-117-49/+122
| | | | | Change-Id: I07d705b9195c04d2d269586d67604150a5bda554 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778Konstantin Tokarev2017-04-0733-57/+333
| | | | | Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20Konstantin Tokarev2017-03-3134-85/+1107
| | | | | Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4Konstantin Tokarev2017-03-2665-50/+1477
| | | | | Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597Konstantin Tokarev2017-03-0424-57/+448
| | | | | Change-Id: Ifc702a2f8477e8a07e51cb0cd44161c1d9a84357 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 7952fc64448c2e3c95c814b81cb055211c400786Konstantin Tokarev2017-02-0311-21/+70
| | | | | Change-Id: I55b781a0908e86519ba08df274b16b8f169631dd Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-0286-463/+3078
| | | | | Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9aKonstantin Tokarev2017-02-0220-91/+96
| | | | | Change-Id: I8a2348dd9eb59df840dde6b66141d562aff29bf4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9aKonstantin Tokarev2017-02-0277-277/+3882
| | | | | Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit a16099e901e36e6d298dd30c0694a2130052d70eKonstantin Tokarev2017-02-028-19/+49
| | | | | Change-Id: I484731400983d1d964bdcf4afc4007f41ca1bb8a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 26dda242e41e9b4d348fc3573d86f58b9e8b51b9Konstantin Tokarev2017-02-0211-7/+368
| | | | | Change-Id: I00833927c575184923449ab99c85c46fec94dc19 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27Konstantin Tokarev2017-02-02108-724/+945
| | | | | Change-Id: I9f66467721cf923468af87915c260c1bb44e013e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit fbdeb5a5c78f666271a638ba10137127bcea61f4Konstantin Tokarev2017-02-0211-30/+44
| | | | | Change-Id: Ie14bf4e3f1f1f7e3b9e5cf60e69a7572dd481006 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3Konstantin Tokarev2017-02-0244-689/+1083
| | | | | Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3Konstantin Tokarev2017-02-02337-1703/+22436
| | | | | Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-0221601-4839959/+1329215
| | | | | Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-026-6/+10
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I54f845386aa362bb77801ffbac6e06339e839fc8
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-6/+10
| |\ | | | | | | | | | Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
| | * Fix build with the Intel compilerThiago Macieira2016-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ICC's supplied math.h has #defines for isnan and signbit. So work around that. Change-Id: I149e0540c00745fe8119fffd1463d16ae0047cb1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Define NOMINMAX on Windows buildsThiago Macieira2016-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows.h has a #define macro for min and max, which causes breakage when we write things like std::max or std::numeric_limits::max(). I don't know why I suddenly started getting this, but it's a good idea to do this change. Change-Id: Ib57b52598e2f452985e9fffd1459f01996c7fb7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Update the detection of MSVC versions to be forward-compatibleThiago Macieira2016-07-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.8 may deprecate the win32-msvc20xx mkspecs, so use the MSVC_VER variable to detect which version of MSVC it is. This commit removes the detection for win32-icc, as it really depended on what version of MSVC headers it was targeting. With Qt prior to 5.8, it was not possible to detect it anyway, so the rule was broken anyway (ICC prior to 16 only worked with MSVC <= 2013, but ICC 17 will work with 2015). Change-Id: Ib57b52598e2f452985e9fffd1459e682978341f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Compile Fix for OpenBSD in C++11 modeRalf Nolden2016-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a __cplusplus condition to an already existing OpenBSD defined part to activate the code only on older gcc compilers. Change-Id: I3ae3c4f792af12868e5efe1c3536f9743de78ce3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Allow making production builds with build-webkit.Konstantin Tokarev2016-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't add CONFIG-=production_build if CONFIG+=production_build was passed in arguments. Change-Id: If401b3a8c1391c71273401257e85274e8db8e2b2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Use QWidget::grab() instead of deprecated QPixmap::grabWidget().Konstantin Tokarev2016-06-271-1/+1
| | | | | | | | | | | | | | | Change-Id: Icf8004f6b1e878d456dd6493fd2b33d95116c586 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I6907c0e780f4eab0126be8af8c9ee6422a4d66b4
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-201-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I2f90b96e6b59af71b3c7973345eb44e8213033d9
| * | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Change-Id: If24f96a7404048129db91b42d519e85ce418db07 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-06-1649-164/+368
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1649-164/+368
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ib5bd1f44e83e29501eaa432ddb47320375f5079a
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-06-161-2/+2
| | |\ \ | | | |/ | | | | | | | | Change-Id: Ieffcbc84ccd66fc59c5849a0e083e82d8a846c32
| | | * Added missing PLATFORM(MAC) checks.Konstantin Tokarev2016-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original patch http://trac.webkit.org/changeset/151646 assumed that ConnectionMac.cpp is specific to PLATFORM(MAC), but we use it as well. Change-Id: Ifb09e1576105c40df28040971129ee32dc041194 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-154-6/+15
| | |\ \ | | | |/ | | | | | | | | Change-Id: I842c8369d9c8647c62d9f1219d65e7a5bca0bf70
| | | * Only Mac port needs ObjC API for JSC.Konstantin Tokarev2016-06-151-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I32d6029139ac5b8118c3a350b68d6e55c8093a1a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Don't use deprecated version suffixes of QStyleOption* classes.Konstantin Tokarev2016-06-153-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1510-11/+70
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic399cf8fef1f26f22338a67393066d69cd969579
| | | * Do not warn about invalid imagesAllan Sandfeld Jensen2016-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Null or invalid images are safe since we are not decoding them. Change-Id: I292685863a0116c25931c096ec183275c891a55d Task-number: QTBUG-53989 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-101-0/+49
| | | |\ | | | | | | | | | | | | | | | Change-Id: I338f187fdd3a9fcf3a928c56ce5ff098e8457f08
| | | | * Changes for 5.6.15.6.1Konstantin Tokarev2016-05-301-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7836d6ed95cf3d3d989a5e3cdc2c077fc6d55d84 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Fixed drawing of zoomed border-image with repeat mode.Konstantin Tokarev2016-05-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image::drawPattern has special optimized path for scaled transform which creates pre-scaled brush and removes scale from original transform. However this change makes following translation to (tr.x(), tr.y()) incorrect because it is expected to be done in scaled coordinate system. Change-Id: I570cf82a4e7f61f6abe3fa4cb9b39aea0e51f2e5 Task-number: QTBUG-53532 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | fix ios device&simulator builds againOswald Buddenhagen2016-05-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the assumption stated in c48fd0cb is actually invalid - configure sets build_all without debug_and_release there. debug_and_release does actually imply build_all, though. to make things less confusing, don't let configure inject iphonesimulator_and_iphoneos into all projects, but handle it like debug_and_release instead. Change-Id: I05258d4a88549608c26d8b3dd9618f5736ff7ce3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | | * | Disable touch_slider if touch_events is disabled.Konstantin Tokarev2016-05-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touch_events is a prerequisite for touch_slider, however, touch_slider is added to WEBKIT_CONFIG before user options processing, so it's possible to produce meaningless configuration with disabled touch_events and enabled touch_slider. It's harmless because all ENABLE(TOUCH_SLIDER) code is also guarded with ENABLE(TOUCH_EVENTS), however it still may be confusing. Change-Id: I149c798f488ec9977ea5b168c0f5d7b7c53d1aec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Moved use_leveldb configuration from detectFeatures to sanitizeFeatures.Konstantin Tokarev2016-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise compilation breaks when indexed_database is disabled, because USE(LEVELDB) is always true. Change-Id: I680475baeb6796cdba859ff8daaba0c39a3e8338 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Added missing break statement.Konstantin Tokarev2016-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Fix tst_QObjectBridge::connectAndDisconnect() failArunprasad Rajkumar2016-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <https://webkit.org/b/119933> Patch by Arunprasad Rajkumar <arurajku@cisco.com> on 2013-08-19 Reviewed by Allan Sandfeld Jensen. Latest version of JSC has unquoted undefined in exception messages. So replaced 'undefined' with undefined. * tests/qobjectbridge/tst_qobjectbridge.cpp: (tst_QObjectBridge::connectAndDisconnect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154273 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ife6167e9f67f540fcef3f3468c37fcb85991216d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2c8ef44a746940e6783586e31b1b13b70e8c4fc8
View Lorry Controller Status