summaryrefslogtreecommitdiff
path: root/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Import Qt5x2 branch of QtWebkit for Qt 5.2Allan Sandfeld Jensen2013-09-191-9/+8
| | | | | | | Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Source/WebKit2: [Qt] Use qInstallMessageHandler() ↵commit-queue2012-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=96648 Patch by Kai Koehne <kai.koehne@digia.com> on 2012-09-28 Reviewed by Jocelyn Turcotte. qInstallMsgHandler() got deprecated in Qt 5. * PluginProcess/qt/PluginProcessMainQt.cpp: (WebKit::messageHandler): (WebKit::PluginProcessMain): * UIProcess/API/qt/tests/util.cpp: (messageHandler): (suppressDebugOutput): * qt/MainQt.cpp: (messageHandler): (main): Tools: [Qt] Use qInstallMessageHandler() https://bugs.webkit.org/show_bug.cgi?id=96648 Patch by Kai Koehne <kai.koehne@digia.com> on 2012-09-28 Reviewed by Jocelyn Turcotte. qInstallMsgHandler() got deprecated in Qt 5. * DumpRenderTree/qt/DumpRenderTreeMain.cpp: (messageHandler): (main): * WebKitTestRunner/qt/main.cpp: (messageHandler): (main): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@129870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
* Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 ↵Simon Hausmann2012-10-161-3/+3
| | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131300)" This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :(
* Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 ↵Simon Hausmann2012-10-151-3/+3
| | | | | | | | | (http://svn.webkit.org/repository/webkit/trunk@131300) WebKit update which introduces the QtWebKitWidgets module that contains the WK1 widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're working on completing the entire split as part of https://bugs.webkit.org/show_bug.cgi?id=99314
* Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b ↵Simon Hausmann2012-05-071-19/+60
| | | | (http://svn.webkit.org/repository/webkit/trunk@116286)
* Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 ↵Simon Hausmann2012-02-031-1/+3
| | | | (http://svn.webkit.org/repository/webkit/trunk@106560)
* Imported WebKit commit 2ea9d364d0f6efa8fa64acf19f451504c59be0e4 ↵Simon Hausmann2012-01-061-0/+70
(http://svn.webkit.org/repository/webkit/trunk@104285)