summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|
* Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-309313-0/+2836062
| | | | Reviewed-by: Andreas Kling
* Remove old QtWebKit.Alexis Menard2011-05-305254-1758183/+0
| | | | Reviewed-by: Andreas Kling
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-182-10/+9
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Enable webkit build for the makefile build system with gcceLiang Qi2011-04-072-10/+9
| | | | | | | | | | | | | | Task-number: QTBUG-18484 Task-number: WEBKIT-57841 Reviewed-by: axis Reviewed-by: Janne Koskinen
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-201-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | * Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included in 4.7.2 should be 2.0.2. Merge-request: 1095 Task-number: QTBUG-17480 Reviewed-by: Jason McDonald
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-181-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed the localized vendor name for Qt SIS packages to "Nokia"
| | * Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-15/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| | |
| * | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | |
| * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1335-35/+35
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| * | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-075-19/+49
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | | doc: Changed a table into 3 tables to eliminate a \raw.Martin Smith2010-10-251-9/+10
| | | |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1735-35/+35
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | | Update copyright year to 2011.Jason McDonald2011-01-1035-35/+35
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | qt project files: create pkg-config files for mingwMark Brand2011-01-101-3/+1
| | | | | | | | | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-255-19/+49
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-243-19/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits) Fixed tst_qwidget::winIdChangeEvent Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. ...
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-192-17/+35
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
| | | * | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These types of events replace text that is already in the widget, but WebKit did not check for replacementLength at all. RevBy: Janne Koskinen Task: QT-4303 Task: https://bugs.webkit.org/show_bug.cgi?id=49787 AutoTest: Included
generated by cgit v0.12 at 2025-03-22 01:08:12 (GMT)