diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
| commit | 43a42f108af6bcbd91f2672731c3047c26213af1 (patch) | |
| tree | 7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp | |
| parent | d9cf437c840c6eb7417bdd97e6c40979255d3158 (diff) | |
| download | qtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz | |
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp')
| -rw-r--r-- | Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp b/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp index 4113d3dfa..e25f0674e 100644 --- a/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp +++ b/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp @@ -28,6 +28,8 @@ #include "config.h" #include "PluginProcessMainUnix.h" +#if ENABLE(PLUGIN_PROCESS) + #include "Logging.h" #include "NetscapePlugin.h" #include "PluginProcess.h" @@ -71,9 +73,9 @@ static int webkitXError(Display* xdisplay, XErrorEvent* error) WK_EXPORT int PluginProcessMainUnix(int argc, char* argv[]) { - ASSERT(argc == 2 || argc == 3); + ASSERT_UNUSED(argc, argc == 2 || argc == 3); bool scanPlugin = !strcmp(argv[1], "-scanPlugin"); - ASSERT(argc == 2 || (argc == 3 && scanPlugin)); + ASSERT_UNUSED(argc, argc == 2 || (argc == 3 && scanPlugin)); #if PLATFORM(GTK) gtk_init(&argc, &argv); @@ -111,3 +113,5 @@ WK_EXPORT int PluginProcessMainUnix(int argc, char* argv[]) } } // namespace WebKit + +#endif |