diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp index ee4e3c38b..31f0de425 100644 --- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp +++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp @@ -77,8 +77,10 @@ const char* ProcessLauncher::processTypeAsString(ProcessType processType) case PluginProcess: return "pluginprocess"; #endif +#if ENABLE(NETWORK_PROCESS) case NetworkProcess: return "networkprocess"; +#endif #if ENABLE(SHARED_WORKER_PROCESS) case SharedWorkerProcess: return "sharedworkerprocess"; @@ -103,10 +105,12 @@ bool ProcessLauncher::getProcessTypeFromString(const char* string, ProcessType& } #endif +#if ENABLE(NETWORK_PROCESS) if (!strcmp(string, "networkprocess")) { processType = NetworkProcess; return true; } +#endif #if ENABLE(SHARED_WORKER_PROCESS) if (!strcmp(string, "sharedworkerprocess")) { |