Diff
Modified: trunk/Source/WebKit2/ChangeLog (129869 => 129870)
--- trunk/Source/WebKit2/ChangeLog 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-28 10:35:11 UTC (rev 129870)
@@ -1,3 +1,22 @@
+2012-09-28 Kai Koehne <[email protected]>
+
+ [Qt] Use qInstallMessageHandler()
+ https://bugs.webkit.org/show_bug.cgi?id=96648
+
+ 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):
+
2012-09-28 Byungwoo Lee <[email protected]>
[EFL][WK2] Clear provider on destructor of {Vibration,Battery,NetworkInfo}Provider.
Modified: trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp (129869 => 129870)
--- trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp 2012-09-28 10:35:11 UTC (rev 129870)
@@ -44,10 +44,10 @@
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 @@
{
QByteArray suppressOutput = qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT");
if (!suppressOutput.isEmpty() && suppressOutput != "0")
- qInstallMsgHandler(messageHandler);
+ qInstallMessageHandler(messageHandler);
QGuiApplication app(argc, argv);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp (129869 => 129870)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp 2012-09-28 10:35:11 UTC (rev 129870)
@@ -57,10 +57,10 @@
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 @@
void suppressDebugOutput()
{
- qInstallMsgHandler(messageHandler); \
+ qInstallMessageHandler(messageHandler); \
if (qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT").isEmpty()) \
qputenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT", "1");
}
Modified: trunk/Source/WebKit2/qt/MainQt.cpp (129869 => 129870)
--- trunk/Source/WebKit2/qt/MainQt.cpp 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Source/WebKit2/qt/MainQt.cpp 2012-09-28 10:35:11 UTC (rev 129870)
@@ -45,10 +45,10 @@
}
#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 @@
// 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));
}
Modified: trunk/Tools/ChangeLog (129869 => 129870)
--- trunk/Tools/ChangeLog 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Tools/ChangeLog 2012-09-28 10:35:11 UTC (rev 129870)
@@ -1,3 +1,19 @@
+2012-09-28 Kai Koehne <[email protected]>
+
+ [Qt] Use qInstallMessageHandler()
+ https://bugs.webkit.org/show_bug.cgi?id=96648
+
+ Reviewed by Jocelyn Turcotte.
+
+ qInstallMsgHandler() got deprecated in Qt 5.
+
+ * DumpRenderTree/qt/DumpRenderTreeMain.cpp:
+ (messageHandler):
+ (main):
+ * WebKitTestRunner/qt/main.cpp:
+ (messageHandler):
+ (main):
+
2012-09-28 Eunmi Lee <[email protected]>
[EFL][WK2] Refactoring initialization and shutdown codes of EFL libraries.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp (129869 => 129870)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp 2012-09-28 10:35:11 UTC (rev 129870)
@@ -57,10 +57,10 @@
#include <wtf/Assertions.h>
-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 @@
// Has to be done before QApplication is constructed in case
// QApplication itself produces debug output.
if (suppressQtDebugOutput)
- qInstallMsgHandler(messageHandler);
+ qInstallMessageHandler(messageHandler);
WebKit::initializeTestFonts();
Modified: trunk/Tools/WebKitTestRunner/qt/main.cpp (129869 => 129870)
--- trunk/Tools/WebKitTestRunner/qt/main.cpp 2012-09-28 10:24:46 UTC (rev 129869)
+++ trunk/Tools/WebKitTestRunner/qt/main.cpp 2012-09-28 10:35:11 UTC (rev 129870)
@@ -74,10 +74,10 @@
}
#endif
-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;
}
@@ -112,7 +112,7 @@
// Has to be done before QApplication is constructed in case
// QApplication itself produces debug output.
if (suppressQtDebugOutput) {
- qInstallMsgHandler(messageHandler);
+ qInstallMessageHandler(messageHandler);
if (qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT").isEmpty())
qputenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT", "1");
}
