From d45ff9df96f475d5ae3b68eb709278eac93e6a92 Mon Sep 17 00:00:00 2001 From: commit-queue Date: Fri, 28 Sep 2012 10:35:11 +0000 Subject: Source/WebKit2: [Qt] Use qInstallMessageHandler() https://bugs.webkit.org/show_bug.cgi?id=96648 Patch by Kai Koehne 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 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 --- Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Tools/DumpRenderTree') diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp index f5e7fc159..1baae7cb8 100644 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp @@ -57,10 +57,10 @@ #include -void messageHandler(QtMsgType type, const char *message) +void messageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) { if (type == QtCriticalMsg) { - fprintf(stderr, "%s\n", message); + fprintf(stderr, "%s\n", qPrintable(message)); return; } // do nothing @@ -113,7 +113,7 @@ int main(int argc, char* argv[]) // Has to be done before QApplication is constructed in case // QApplication itself produces debug output. if (suppressQtDebugOutput) - qInstallMsgHandler(messageHandler); + qInstallMessageHandler(messageHandler); WebKit::initializeTestFonts(); -- cgit v1.2.1