diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
| commit | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebKit2/WebProcess/qt/WebProcessQt.cpp | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 5087e0ced43d813eb6f765913a6fc3958d2a7a9d (diff) | |
| download | qtwebkit-81cbb264cb9446c4408124d50aeff50164ad0ab4.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144
Diffstat (limited to 'Source/WebKit2/WebProcess/qt/WebProcessQt.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/qt/WebProcessQt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp index d4864af5b..e687966db 100644 --- a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp +++ b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp @@ -39,7 +39,7 @@ #include <WebCore/RuntimeEnabledFeatures.h> #include <wtf/RAMSize.h> -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) #include <dispatch/dispatch.h> #include <mach/host_info.h> #include <mach/mach.h> @@ -99,7 +99,7 @@ void WebProcess::platformClearResourceCaches(ResourceCachesToClear) { } -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) static void parentProcessDiedCallback(void*) { QCoreApplication::quit(); @@ -134,7 +134,7 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par } #endif -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) pid_t ppid = getppid(); dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, ppid, DISPATCH_PROC_EXIT, queue); |