summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Remove old QtWebKit.Alexis Menard2011-05-305-1563/+0
| | | | Reviewed-by: Andreas Kling
* Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
|
* Ensure WebView press delay timer is cancelled when grab is taken.Martin Jones2010-11-232-0/+12
| | | | | | | | | Flickable steals the grab, but the timer was not stopped and the keepGrab flag is set and the mouse grabbed. This means that the WebView now has the grab and subsequent clicks on another element are ignored. Task-number: QTBUG-15529 Reviewed-by: Joona Petrell
* Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-061-1/+5
| | | | | | | | | | If QDeclarativeWebView was instantiated twice an assert was triggered by QWebSettings::enablePersistentStorage(); This patch is crtical for tooling (Bauhaus) Task-number: QTBUG-14278 Reviewed-by: Aaron Kennedy
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-071-1/+5
|\
| * Ensure WebView gets focus when an editable node is clicked on.Martin Jones2010-09-061-1/+5
| | | | | | | | | | Task-number: QTBUG-13342 Reviewed-by: Michael Brasser
* | Doc: More work on the QML documentation.David Boddie2010-09-071-28/+58
| |
* | Doc: qdoc fixes.David Boddie2010-09-021-4/+4
|/
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | ...and a set of functional group pages.
* Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
| | | | Reviewed-by: Trust Me
* Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | | | | Task: QTBUG-11396 RevBy: Simon Hausmann
* DocsBea Lam2010-06-281-0/+2
|
* Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-241-7/+0
| | | | | Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-231-0/+3
| | | | | | * Build fixes for package builds * Fix build with QT_NO_COMBOBOX * Upstream David's doc fix
* Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-211-11/+13
| | | | | | | | Integrated changes: || <https://webkit.org/b/40714> || [Qt] Compilation in QWebPagePrivate::timerEvent with clang || || <https://webkit.org/b/40717> || [Qt] Bridge documentation: some snippets have the wrong indentation || || <https://webkit.org/b/40662> || [Qt] Avoid truncation of zoom factor in QWebFrame's print function. ||
* Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-181-3/+3
| | | | Doc fixes from Alexis :)
* Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5Simon Hausmann2010-06-182-2/+8
| | | | | | Doc and build fixes: http://trac.webkit.org/changeset/61400
* Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5Simon Hausmann2010-06-183-7/+7
| | | | * Build fixes from the trunk
* Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26baSimon Hausmann2010-06-185-0/+1505
Integrated: || <https://webkit.org/b/40050> || [Qt] Upstream the WebKit QML integration plugin ||