Merge remote-tracking branch 'origin/5.15' into dev

Blacklists tst_Accessibility::focusChild() for now.

Conflicts:
	src/core/api/core_api.pro
	src/core/net/plugin_response_interceptor_url_loader_throttle.h
	src/process/process.pro

Change-Id: I95821a3851120dc16673f4c760e802952eae5c41

1 files changed, 39 insertions, 1 deletions

diff --git a/src/process/process.pro b/src/process/process.pro
index 459eb9969..55b43ecad 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -9,20 +9,53 @@ INCLUDEPATH += ../core
 
 SOURCES = main.cpp
 
+CONFIG -= ltcg
+
+# On windows we need to statically link to the windows sandbox code
 win32 {
+    # The Chromium headers we include are not clean
+    CONFIG -= warnings_are_errors
+
+    # Look for linking information produced by GN
+    linking_pri = $$OUT_PWD/../core/$$getConfigDir()/qtwebengine_sandbox_win.pri
+
+    !include($$linking_pri) {
+        error("Could not find the linking information that gn should have generated.")
+    }
+    isEmpty(NINJA_OBJECTS): error("//sandbox/win:sandbox linking changed, update process.pro")
+    isEmpty(NINJA_ARCHIVES): error("//sandbox/win:sandbox linking changed, update process.pro")
+
+    LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS $$NINJA_ARCHIVES $$NINJA_OBJECTS
+    QMAKE_LFLAGS += $$NINJA_LFLAGS
+    POST_TARGETDEPS += $$eval($$NINJA_TARGETDEPS)
+
+    CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir()
+    INCLUDEPATH += $$CHROMIUM_SRC_DIR \
+                   $$OUT_PWD/../core/$$getConfigDir()/gen
+
     SOURCES += \
         support_win.cpp
 
     msvc: QMAKE_LFLAGS += /MANIFESTINPUT:$$PWD/process.exe.manifest
 }
 
-load(qt_app)
+TEMPLATE = app
+
+load(qt_build_paths)
+
+!build_pass:qtConfig(debug_and_release): CONFIG += release
+CONFIG += relative_qt_rpath
 
 qtConfig(build_all): CONFIG += build_all
 
 qtConfig(framework) {
     # Deploy the QtWebEngineProcess app bundle into the QtWebEngineCore framework.
     DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/$$QT_MAJOR_VERSION/Helpers
+
+    # Deploy the entitlements file so macdeployqt can use it.
+    entitlements.files = QtWebEngineProcess.entitlements
+    entitlements.path = Contents/Resources/
+    QMAKE_BUNDLE_DATA += entitlements
 } else {
     CONFIG -= app_bundle
     win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin
@@ -35,3 +68,8 @@ qtConfig(framework) {
 } else {
     target.path = $$[QT_INSTALL_LIBEXECS]
 }
+
+load(qt_targets)
+load(qt_common)
+
+INSTALLS += target