summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-081-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 (cherry picked from commit f532679ca11914b453e22342f2ae5e9f790ce47a)
* Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2811-5/+332
| | | | | | | | Includes Jay's fix for the JSC memory consumption on Symbian https://bugs.webkit.org/show_bug.cgi?id=34349 See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9 (cherry picked from commit dbf1d0339a0cfbe60e6b3e45f39e6c02aa3de0a8)
* Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| | | | The missing install functionality is only true for mmp based systems.
* Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
| | | | | | | Sync with qtwebkit-2.0 branch * Includes Thiago's intel compiler fixes * Girish' Maemo5 local rendering fixes
* QtWebKit: Update tag files to match the same content on qtwebkit.gitJocelyn Turcotte2010-09-082-2/+2
| | | | | | | | | | | NOTE: Some patches have been made in the 4.7.0 branch for src/3rdparty/webkit that are not available upstream. This shouldn't have happened, however these patches mostly address issues regarding builds of QtWebKit inside the Qt source tree so it doesn't matter so much regarding source packages. Reviewed-by: Simon Hausmann
* QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-082-1/+13
| | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 460b651cbe4f6994b492ff08614e57b0e31a24c8 Reviewed-by: Simon Hausmann
* QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-081-4/+4
| | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 8c902b12f771829cecd22edb7742636c8de816c2 Reviewed-by: Simon Hausmann
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-072-3/+7
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-061-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed incorrect Symbian scoping. Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2 QPixmaps try to access FBS connection after the connection has been closed.
| | * Fixed incorrect Symbian scoping.axis2010-09-061-2/+2
| | | | | | | | | | | | The missing install functionality is only true for mmp based systems.
| * | 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
|/
* fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| | | | | | | | always add the target, even if building inside Qt - as opposed to the headers and libraries, there are no rules for that coming from qbase.pri. Task-number: QTBUG-13306
* fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-6/+0
| | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
* let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-233-2/+8
| | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | ...and a set of functional group pages.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813
| * Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-104-3/+16
| | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/43782> || [Qt] NPAPI plugins not drawn until page scrolled ||
* | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-1/+1
|/
* Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245Simon Hausmann2010-08-056-4/+48
| | | | || <https://webkit.org/b/43530> || [Qt] Input mode states are not reset after entering a password field ||
* Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
| | | | | | | | Integrated changes: || <https://webkit.org/b/36723> || Crash while uploading a PDF document on www.largefilesasap.com || || <https://webkit.org/b/40572> || [Qt] Stack overflow when converting navigator object to QVariant || || <https://webkit.org/b/43037> || [Qt] Incorrect input method hints ||
* Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
| | | | Backported various crash fixes
* Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-07-2613-12/+182
| | | | | | | | | Integrated changes: || <https://webkit.org/b/42474> || Spatial navigation: do not consider outline for focusable element boundaries || || <https://webkit.org/b/41484> || [Qt] Clamp color stops passed to QGradient to 1.0 || || <https://webkit.org/b/29381> || [Qt] [Regression] QWebView::setHtml() executes script body twice || || <https://webkit.org/b/30879> || Loading HTML with a JS alert() when the DocumentLoader has been set to not defer data load results in ASSERT ||
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-07-236-2/+54
|
* Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+10
|\ | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-07-211-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Also added sqlite detection in case sqlite is not present in the SDK. This is possible if WebKit is compiled standalone. The inclusion part is a consequence of commit c578c6c1d6d in the Qt repository. It will not work on Qt versions < 4.7.1, but that is ok, since the only build system it will affect is marked as experimental in the whole 4.7 series. RevBy: Kenneth Rohde Christiansen Task: https://bugs.webkit.org/show_bug.cgi?id=42744
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-1659-160/+979
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| * Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-07-0959-160/+979
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37760> || FrameView's layout root can be detached by style recalc || || <https://webkit.org/b/38922> || innerHTML decompilation issues in textarea || || <https://webkit.org/b/36878> || REGRESSION: Trailing colon on hostnames (with no port specified) causes "Not allowed to use restricted network port" || || <https://webkit.org/b/37781> || [XHR] Cross-Origin synchronous request with credential raises NETWORK_ERR || || <https://webkit.org/b/36502> || Cross-origin bypass: iFrame.src can be set to a JavaScript URL via nodeValue or textContent || || <https://webkit.org/b/28697> || WebKit crash on WebCore::Node::nodeIndex() || || <https://webkit.org/b/37031> || Cross-origin bypass: Javascript URL can be set as iframe.src via multiple DOM aliases || || <https://webkit.org/b/36522> || [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled || || <https://webkit.org/b/38583> || Use of stale pointers whilst normalizing DOM nodes with mutation event handlers that modify element attributes || || <https://webkit.org/b/41412> || [Qt] Canvas arcTo() should draw straight line to p1 if p0, p1 and p2 are collinear || || <https://webkit.org/b/39878> || [Qt]: REGRESSION(r58703): QWebSettings::JavascriptCanAccessClipboard has wrong case in "Javascript" part. || || <https://webkit.org/b/26824> || focus() behavior permits keystrokes to be redirected across domains || || <https://webkit.org/b/39508> || Crash in WebCore::toAlphabetic() while running MangleMe || || <https://webkit.org/b/36571> || WebKit should treat port numbers outside of the valid range as being blacklisted || || <https://webkit.org/b/38497> || Make sure that http URLs always have a host in SecurityOrigin || || <https://webkit.org/b/38626> || ZDI-CAN-765: CSS Charset Text Transformation Vulnerability || || <https://webkit.org/b/36838> || Cross-origin image theft via SVGs as a canvas pattern || || <https://webkit.org/b/27751> || [sg:high] Copying text to the system clipboard can be done in any context || || <https://webkit.org/b/36843> || REGRESSION (r47291): XHR allows arbitrary XSRF across domains || || <https://webkit.org/b/37230> || REGRESSION (4.0.5): Safari asks for credentials all the time when authenticating to Windows IIS Server || || <https://webkit.org/b/37618> || Memory Corruption with Drag-Drop item from a purged document. || || <https://webkit.org/b/38260> || Frame.src allows javascript URLs with starting spaces || || <https://webkit.org/b/38261> || Table layout crash bug ||
* | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
|/ | | | Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-032-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Hide some more files from git-status. Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed deployment locations for various profiles. Added a top-level runonphone target for Qt and QtWebKit. QS60Style: Simplify QMenu drawing QS60Style: Remove gap from QProgressDialog ColorDialog is incorrectly positioned Support for "deploy" make target in Symbian qtguiu.def merge conflict fix Fix for include "private/qt_s60_p.h" in non-symbian builds Making orbit input methods work with Qt apps with -no-s60 Using the remaining valid data to construct the QTime object when msec parsing failed. QProgressDialog text is too close to dialog border fix for broken input method loading Avkon Removal DEF file updates Stub version of QS60Style Avkon removal configured with -no-s60 QFileDialog broken in landscape in N8
| * Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | | | | | | | | | Task: QTBUG-11396 RevBy: Simon Hausmann
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7mread2010-07-027-24/+74
| |\ | | | | | | | | | | | | | | | Conflicts fixed: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Making orbit input methods work with Qt apps with -no-s60 Using the remaining valid data to construct the QTime object when msec parsing failed. QProgressDialog text is too close to dialog border fix for broken input method loading Avkon Removal DEF file updates Stub version of QS60Style Avkon removal configured with -no-s60 QFileDialog broken in landscape in N8
| | * | Avkon removal configured with -no-s60mread2010-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
* | | | Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9Simon Hausmann2010-07-029-4/+46
| |_|/ |/| | | | | | | | | | | | | | | | | Integrated: || <https://webkit.org/b/36618> || [Qt] LayoutTests/http/tests/appcache/fallback.html crashes || || <https://webkit.org/b/39359> || [Qt] TiledBackingStore updates broken when not using resizesToContents mode ||
* | | Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10Simon Hausmann2010-07-017-24/+74
|/ / | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/41451> || [Qt] Crash when destroying a QWebView with a QComboBox as its child. || || <https://webkit.org/b/41157> || Spatial Navigation: refactor spatial-navigation-utils.js to support testing nested frames deeper than one level ||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-011-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits) Reseted QtDeclarative module def files Get WebView tests passing again Remove arbitrary width checks Removed compilation warning for systems with no OpenGL support Fix bug in SameGame's dialog component doc fix Add abstractitemmodel example, and fix some model docs docs - quote code with snippets, other improvements Fix webkit import for webkit tests. Remove qmlviewer dependency on QDeclarativeTimer Remove a few more unnecessary exports. Don't export declarative private classes Add additional text layout benchmarks. Don't access uninitialized value. Minor Twitter demo enhancements Added SET_BINDING message to QDeclarative debugger protocol Add ListView.nextSection attached property Remove the old font.outline documentation Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-301-0/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-291-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| | | * DocsBea Lam2010-06-281-0/+2
| | | |
* | | | Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316Simon Hausmann2010-07-0114-35/+298
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). || || <https://webkit.org/b/40846> || [Qt] GraphicsLayerQt delay seems unnecessary. || || <https://webkit.org/b/41160> || Spatial Navigation: make elements in inner frames nested more than 1 level deep focusable || || <https://webkit.org/b/39019> || [Qt] Combobox doesn't close when scrolling in graphicsbased mode || || <https://webkit.org/b/41164> || [Qt] QtWebKit crashes if <select>'s render changes in its onchange event || || <https://webkit.org/b/41198> || [QT][S60] build-webkit scripts picks wrong make spec for windows build || || <https://webkit.org/b/41278> || [Qt] Replace single treat-as-space characters with normal space || || <https://webkit.org/b/37303> || [Qt] Application crash on exit if NPPlugin is loaded || || <https://webkit.org/b/40378> || [Qt] When any geometry change happens to a node it will resize the backing cache || || <https://webkit.org/b/40795> || [Qt] Crash when uploading document to Google Docs || || <https://webkit.org/b/40446> || [Qt] Only 10 websites can be loaded consecutively when using QtWebkit 2.0 ||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-291-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment paths for WebKit declarative plugin. Fix s60main linking issue with gcce applications Fixed deployment paths for the symbian/linux-armcc mkspec. Fixed a relative path problem in qml demos. Added the APP_PRIVATE_DIR_BASE variable. Various fixes to autotests when using the symbian/linux-armcc mkspec. Fixed Symbian resources not honoring TARGET with a path. Removed useless comments.
| * | Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| |/
* | Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
|/ | | | | || <https://webkit.org/b/40000> || [Qt] QGraphicsWebView crash when calling setScale() before setUrl() || || <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). ||
* Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| | | | | | | | * Fixed QML packaging || <https://webkit.org/b/39304> || Add an inlineCapacity template parameter to ListHashSet and use it to shrink the positioned object list hash set. || || <https://webkit.org/b/39309> || Allocate the m_preloads list hash set dynamically and free it when done. || || <https://webkit.org/b/33150> || Do not render the full frame when there is some elements with fixed positioning ||
* Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-242-7/+7
| | | | | Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
| | | | | | * Build fixes for package builds * Fix build with QT_NO_COMBOBOX * Upstream David's doc fix
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2281-6308/+3063
|\
| * Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/6274> || text repainting does not account for glyphs which draw outside the typographic bounds of the font || || <https://webkit.org/b/40840> || [Qt] Symbian builds in release sometimes try to link with the debug JavaScriptCore static lib. || || <https://webkit.org/b/40620> || [Qt] Get rid of the the unused imageSize of ImageDecoderQt::internalHandleCurrentImage() || || <https://webkit.org/b/37292> || http://trac.webkit.org/changeset/57215 caused perf regressions || || <https://webkit.org/b/40077> || [Qt] Implement the simple font code path. || || <https://webkit.org/b/40910> || [Qt] Avoid unnecessary image conversion in RGBA32Buffer::zeroFill() || || <https://webkit.org/b/40797> || [Qt] Decode images directly to QPixmap || || <https://webkit.org/b/36510> || [chromium] use integral glyph widths ||
generated by cgit v0.12 at 2024-11-12 16:35:13 (GMT)