summaryrefslogtreecommitdiff
path: root/src/core/process_main.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-16 18:34:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-08-04 11:20:50 +0200
commitfae023b184f6c044e85f4ca6052c306d519e2e85 (patch)
tree0c470f156e41fbe5d47782f34a3a8afc17ee3147 /src/core/process_main.cpp
parent38a6d268b09c49878b3a9b4819771f5c74925c35 (diff)
downloadqtwebengine-fae023b184f6c044e85f4ca6052c306d519e2e85.tar.gz
Adaptations for Chromium 100
Pick-to: 6.4 Change-Id: I217c87657f544a2e868de7291353ff1143e20902 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/process_main.cpp')
-rw-r--r--src/core/process_main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/process_main.cpp b/src/core/process_main.cpp
index 70c4a0970..ce92db083 100644
--- a/src/core/process_main.cpp
+++ b/src/core/process_main.cpp
@@ -4,10 +4,10 @@
#include "qtwebenginecoreglobal_p.h"
#include "content_main_delegate_qt.h"
#include "content/public/app/content_main.h"
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
#include "sandbox/win/src/sandbox_types.h"
#include "content/public/app/sandbox_helper_win.h"
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
#include "sandbox/mac/seatbelt_exec.h"
#endif
@@ -19,7 +19,7 @@ int processMain(int argc, const char **argv)
ContentMainDelegateQt delegate;
content::ContentMainParams params(&delegate);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
HINSTANCE instance_handle = NULL;
params.sandbox_info = QtWebEngineSandbox::staticSandboxInterfaceInfo();
sandbox::SandboxInterfaceInfo sandbox_info = {nullptr};
@@ -31,14 +31,14 @@ int processMain(int argc, const char **argv)
#else
params.argc = argc;
params.argv = argv;
-#endif // OS_WIN
-#if defined(OS_MAC)
+#endif // IS_WIN
+#if BUILDFLAG(IS_MAC)
sandbox::SeatbeltExecServer::CreateFromArgumentsResult seatbelt =
sandbox::SeatbeltExecServer::CreateFromArguments(argv[0], argc, const_cast<char**>(argv));
if (seatbelt.sandbox_required) {
CHECK(seatbelt.server->InitializeSandbox());
}
-#endif // defined(OS_MAC)
+#endif // IS_MAC
return content::ContentMain(std::move(params));
}