diff options
Diffstat (limited to 'Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp')
-rw-r--r-- | Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp index 96e676d6e..7a93fbb85 100644 --- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp @@ -34,7 +34,7 @@ #include <QGuiApplication> #include <QStringList> #include <QtGlobal> -#include <WebCore/RunLoop.h> +#include <wtf/RunLoop.h> using namespace WebCore; @@ -65,6 +65,7 @@ static bool initializeGtk() Q_DECL_EXPORT int PluginProcessMain(int argc, char** argv) { +#if PLUGIN_ARCHITECTURE(X11) QByteArray suppressOutput = qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT"); if (!suppressOutput.isEmpty() && suppressOutput != "0") qInstallMessageHandler(messageHandler); @@ -99,9 +100,10 @@ Q_DECL_EXPORT int PluginProcessMain(int argc, char** argv) parameters.connectionIdentifier = identifier; parameters.extraInitializationData.add("plugin-path", app.arguments().at(2)); - WebKit::PluginProcess::shared().initialize(parameters); + WebKit::PluginProcess::singleton().initialize(parameters); RunLoop::run(); +#endif return 0; } |