diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
| commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
| tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | |
| parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
| download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz | |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
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; } |