summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427eAdemar de Souza Reis Jr2011-08-268-78/+69
|
* Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fdAdemar de Souza Reis Jr2011-08-258-2/+14
| | | | | This time also including WebKitLibraries/*.a, needed for the Mac build.
* Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0Ademar de Souza Reis Jr2011-08-2547-71/+1312
|
* Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4bAdemar de Souza Reis Jr2011-08-18301-22/+392
| | | | | This time including webkit/include/ files generated on a Mac (thanks to Alexis Menard).
* Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007Ademar de Souza Reis Jr2011-08-114-2/+12
| | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59Ademar de Souza Reis Jr2011-08-11139-4752/+8663
| | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-0/+3
|\ | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * Check for buffer overflow in Lookup_MarkMarkPosJiang Jiang2011-07-191-0/+3
| | | | | | | | | | | | | | | | That may cause crash in this function with certain fonts. Task-number: QTBUG-17238 Done-by: Alberto Garcia <agarcia@igalia.com> Reviewed-by: Jiang Jiang
| * Update licenseheader text in source filesJyri Tahtela2011-05-132-34/+34
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Forward port qt modifications for sqlite3.cCharles Yin2011-07-191-2/+16
| | | | | | | | | | | | | | | | | | Forward port from: 1. c42bc88a9f366899747945a4478492cf765c7166 2. 0d61cf15358e1ff0b5125542ed4a9c4b7e96c141 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard
* | Forward port the vxworks changesCharles Yin2011-07-191-3/+28
| | | | | | | | | | | | | | forward port from d7b688870aead912690188b324d370b920a7a600 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard
* | Update sqlite to 3.7.7.1Charles Yin2011-07-193-20292/+39857
| | | | | | | | | | | | | | | | Updated sqlite3.h, sqlite3.c and shell.c from sqlite.org SHA1 for sqlite3.c: d47594b8a02f6cf58e91fb673e96cb1b397aace0 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard
* | Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45Alexis Menard2011-06-296-14/+109
| | | | | | | | Reviewed-by: Andreas Kling
* | 2011-05-23 Matthew Delaney <mdelaney@apple.com>Alexis Menard2011-06-294-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 * wtf/MathExtras.h: (clampToInteger): (clampToPositiveInteger): 2011-05-23 Matthew Delaney <mdelaney@apple.com> Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 No new tests. The SVG tests mask-excessive-malloc.svg and pattern-excessive-malloc.svg exercise this code path. * platform/graphics/FloatRect.cpp: (WebCore::enclosingIntRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87103 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-283-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it. https://bugs.webkit.org/show_bug.cgi?id=63562 Some Qt auto-tests rely on <QtX/x.h> types of includes. * Api/qwebkitplatformplugin.h: * symbian/platformplugin/qwebkitplatformplugin.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89958 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | 2011-06-27 Joe Wild <joseph.wild@nokia.com>Alexis Menard2011-06-282-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Tests that a plugin of a swf file in a hidden iframe will not crash. This test required more than 1 content file and a timeout or else it would not repeat the error condition. This test will only crash on platforms (like Symbian) that don't allow nonvirtual functions to have a null this pointer. * plugins/hidden-iframe-with-swf-plugin-expected.txt: Added. * plugins/hidden-iframe-with-swf-plugin.html: Added. * plugins/resources/iframe-content-with-swf-plugin.html: Added. 2011-06-27 Joe Wild <joseph.wild@nokia.com> Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Check for a null renderer to fix a crash. This situation can arise when external content/plugins is referenced from html elements with style="display:none". Test: plugins/hidden-iframe-with-swf-plugin.html * page/FrameView.cpp: (WebCore::FrameView::windowClipRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89876 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-284-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use QtQuick imports in Api tests rather than old deprecated Qt 4.x imports. https://bugs.webkit.org/show_bug.cgi?id=63533 We need to use the new QtQuick 1.x imports rather than the old deprecated version. * tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml: * tests/qdeclarativewebview/resources/webviewtest.qml: * tests/qdeclarativewebview/resources/webviewtestdefault.qml: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89923 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9bAlexis Menard2011-06-2752-2120/+2901
| | | | | | | | | | | | Beta1 of QtWebkit 2.2. Reviewed-by: Andreas Kling
* | Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90Alexis Menard2011-06-2221-76/+530
| | | | | | | | Reviewed-By: Andreas Kling
* | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-223-8/+169
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-141-8/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. Fix a problem where the video would'nt show on some containers QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon.
| | * \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-262-34/+34
| | |\ \
| | * \ \ Merge branch '4.8-upstream'Thierry Bastian2011-05-194-0/+57
| | |\ \ \
| | * | | | Fix a problem where the video would'nt show on some containersThierry Bastian2011-05-161-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was linked to the detection of a video stream in the graph. Only the decoders were tested but the demuxer can directly provide the video stream. Reviewed-By: TrustMe Task-Number: QTBUG-19348
| * | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-063-34/+40
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandclipboard.cpp src/plugins/platforms/wayland/qwaylandclipboard.h src/plugins/platforms/wayland/qwaylanddisplay.cpp src/s60installs/eabi/QtOpenGLu.def
| * | | | | Add authentication token support for wayland windowsLasse Holmstedt2011-05-252-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For compositors that support it, the wayland clients can associate themselves with an auth token, specified by WL_AUTHENTICATION_TOKEN env var, or by directly specifying it in the wayland client plugin. Reviewed-by: Samuel Rødal
| * | | | | Move wayland headers files to 3rdparty due to copyright issuesLasse Holmstedt2011-05-242-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
* | | | | | Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114Alexis Menard2011-06-2061-1682/+1556
| | | | | |
* | | | | | Attempt to get Symbian building with SQLite.Andreas Kling2011-06-101-0/+9
| | | | | |
* | | | | | Make the headers test pass by including QtGui/QColor instead of QColor.Andreas Kling2011-06-101-1/+1
| | | | | |
* | | | | | Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib ↵Andras Becsi2011-06-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to CONFIG. Reviewed by Andreas Kling
* | | | | | Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.Andreas Kling2011-06-081-2/+2
| | | | | |
* | | | | | Use WTF::notFound instead of -1 to check for Vector::find() errors.Andreas Kling2011-06-081-2/+2
| | | | | |
* | | | | | The autotests don't even build on Symbian, skip them for now.Andreas Kling2011-06-081-1/+3
| | | | | |
* | | | | | Hack SystemTimeWin.cpp to build on MSVC2005.Andreas Kling2011-06-081-0/+4
| | | | | |
* | | | | | Make Float32Array and Int16Array build on RVCT 2.x.Andreas Kling2011-06-082-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Partial merge of <http://trac.webkit.org/changeset/88336>.
* | | | | | Fix build with RVCT 2.xAndreas Kling2011-06-071-1/+2
| | | | | |
* | | | | | Updated WebKit to cbc99535043a2abc98d6701943595f52fbaf5b19Andreas Kling2011-06-064-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alexis Menard
* | | | | | Updated WebKit to 4e7dfbab30278b0427e699baaadbf3e5aab88203Alexis Menard2011-06-0365-367/+1772
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
* | | | | | Updated WebKit to dbda3e9596b836ab6eb88c500766dba6745759beAlexis Menard2011-06-0313-12/+143
| | | | | |
* | | | | | Some qmake black magic to pick up the right file.Alexis Menard2011-06-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I deleted the old hack of Andreas, it's not needed. Reviewed-by: Andreas Kling
* | | | | | Add a dummy Source.pro that simply includes WebKit.proAndreas Kling2011-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is my sneaky attempt at making Symbian build. Reviewed-by: Alexis Menard
* | | | | | Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-028-119/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: Andreas Kling
* | | | | | Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-0282-4251/+1705
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
* | | | | | Updated WebKit to efbf910ad7c49e8cdf81411b4ac0abeea0efd8f8Alexis Menard2011-06-0219-58/+324
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: Andreas Kling
* | | | | | Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-06-012-0/+251
| | | | | |
* | | | | | Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-05-3115-131/+58
| | | | | |
* | | | | | Make QtWebKit build properly. QtWebKit is not just build by WebCore.pro butAlexis Menard2011-05-312-127/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by QtWebKit.pro. We should read that one instead. I also removed some files which should not be here. Reviewed by: Andreas Kling
* | | | | | Updated WebKit to 65360d3d3377f120aecccf1bf9b9ae9444d488e1Alexis Menard2011-05-3127-72/+232
| | | | | |
* | | | | | Updated WebKit to af58e9520937cc6fc3e31fe5d6682d19842e044dAlexis Menard2011-05-3119-37/+217
| | | | | |