From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 7 May 2012 11:21:11 +0200 Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286) --- Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp | 38 ++++------------------- 1 file changed, 6 insertions(+), 32 deletions(-) (limited to 'Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp') diff --git a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp index 91e7ae437..99eb68185 100644 --- a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp +++ b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp @@ -25,19 +25,17 @@ */ #include "config.h" - #include "WebProcess.h" -#include -#include -#include -#include +#include #include #include #include #include #include -#include +#include +#include +#include #if USE(ACCELERATED_COMPOSITING) #include "WebGraphicsLayer.h" @@ -141,33 +139,8 @@ static void initializeProxy() QNetworkProxyFactory::setUseSystemConfiguration(true); } -void messageHandler(QtMsgType type, const char* message) -{ - if (type == QtCriticalMsg) { - fprintf(stderr, "%s\n", message); - return; - } - - // Do nothing -} - -Q_DECL_EXPORT int WebProcessMainQt(int argc, char** argv) +Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app) { - // Has to be done before QApplication is constructed in case - // QApplication itself produces debug output. - QByteArray suppressOutput = qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT"); - if (!suppressOutput.isEmpty() && suppressOutput != "0") - qInstallMsgHandler(messageHandler); - - QApplication::setGraphicsSystem(QLatin1String("raster")); - QApplication* app = new QApplication(argc, argv); -#ifndef NDEBUG - if (qgetenv("QT_WEBKIT2_DEBUG") == "1") { - qDebug() << "Waiting 3 seconds for debugger"; - sleep(3); - } -#endif - initializeProxy(); srandom(time(0)); @@ -209,6 +182,7 @@ Q_DECL_EXPORT int WebProcessMainQt(int argc, char** argv) RunLoop::run(); // FIXME: Do more cleanup here. + delete app; return 0; } -- cgit v1.2.1