diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit2/qt/MainQt.cpp | |
parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit2/qt/MainQt.cpp')
-rw-r--r-- | Source/WebKit2/qt/MainQt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit2/qt/MainQt.cpp b/Source/WebKit2/qt/MainQt.cpp index 3f0dce22f..16e4faa2e 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 QMessageLogContext&, const QString& message) +static void messageHandler(QtMsgType type, const char* message) { if (type == QtCriticalMsg) { - fprintf(stderr, "%s\n", qPrintable(message)); + fprintf(stderr, "%s\n", 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") - qInstallMessageHandler(messageHandler); + qInstallMsgHandler(messageHandler); return WebKit::WebProcessMainQt(new QApplication(argc, argv)); } |