diff options
| author | commit-queue <commit-queue@webkit.org> | 2012-09-28 10:35:11 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 08:57:45 +0200 |
| commit | d45ff9df96f475d5ae3b68eb709278eac93e6a92 (patch) | |
| tree | ff2e8d487411d28c8970b1146f75879d32f01677 /Source | |
| parent | b297e0fa5c217c9467033b7c8b46891a52870120 (diff) | |
| download | qtwebkit-d45ff9df96f475d5ae3b68eb709278eac93e6a92.tar.gz | |
Source/WebKit2: [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.
* 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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/tests/util.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit2/qt/MainQt.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp index 8cb6bcdf5..ac6f2c1bd 100644 --- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp @@ -44,10 +44,10 @@ using namespace WebCore; namespace WebKit { -static void messageHandler(QtMsgType type, const char* message) +static void messageHandler(QtMsgType type, const QMessageLogContext&, const QString& message) { if (type == QtCriticalMsg) { - fprintf(stderr, "%s\n", message); + fprintf(stderr, "%s\n", qPrintable(message)); return; } @@ -71,7 +71,7 @@ Q_DECL_EXPORT int PluginProcessMain(int argc, char** argv) { QByteArray suppressOutput = qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT"); if (!suppressOutput.isEmpty() && suppressOutput != "0") - qInstallMsgHandler(messageHandler); + qInstallMessageHandler(messageHandler); QGuiApplication app(argc, argv); diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp index 4525e882b..c65fae305 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp +++ b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp @@ -57,10 +57,10 @@ bool waitForSignal(QObject* obj, const char* signal, int timeout) return timeoutSpy.isEmpty(); } -static void messageHandler(QtMsgType type, const char* message) +static 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 @@ -68,7 +68,7 @@ static void messageHandler(QtMsgType type, const char* message) void suppressDebugOutput() { - qInstallMsgHandler(messageHandler); \ + qInstallMessageHandler(messageHandler); \ if (qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT").isEmpty()) \ qputenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT", "1"); } diff --git a/Source/WebKit2/qt/MainQt.cpp b/Source/WebKit2/qt/MainQt.cpp index 16e4faa2e..3f0dce22f 100644 --- a/Source/WebKit2/qt/MainQt.cpp +++ b/Source/WebKit2/qt/MainQt.cpp @@ -45,10 +45,10 @@ static void sigcontHandler(int) } #endif -static void messageHandler(QtMsgType type, const char* message) +static void messageHandler(QtMsgType type, const QMessageLogContext&, const QString& message) { if (type == QtCriticalMsg) { - fprintf(stderr, "%s\n", message); + fprintf(stderr, "%s\n", qPrintable(message)); return; } @@ -82,7 +82,7 @@ int main(int argc, char** argv) // QApplication itself produces debug output. QByteArray suppressOutput = qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT"); if (!suppressOutput.isEmpty() && suppressOutput != "0") - qInstallMsgHandler(messageHandler); + qInstallMessageHandler(messageHandler); return WebKit::WebProcessMainQt(new QApplication(argc, argv)); } |