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

 Conflicts:
	src/core/compositor/delegated_frame_node.cpp
	src/core/core_chromium.pri
	src/core/render_widget_host_view_qt.cpp

Change-Id: I9387151e9647c87fc387095e7b6d8d66560cdf71

5 files changed, 47 insertions, 32 deletions

diff --git a/src/pdf/config/ios.pri b/src/pdf/config/ios.pri
index 5dc7faf9d..1dcbeffde 100644
--- a/src/pdf/config/ios.pri
+++ b/src/pdf/config/ios.pri
@@ -26,7 +26,6 @@ use_allocator_shim=false \
 use_allocator=\"none\" \
 use_custom_libcxx=false \
 v8_use_external_startup_data=false \
-v8_use_snapshot=false \
 toolkit_views=false \
 treat_warnings_as_errors=false \
 safe_browsing_mode=0 \
diff --git a/src/pdf/pdf.pro b/src/pdf/pdf.pro
index fcdfafab5..9f98c32b0 100644
--- a/src/pdf/pdf.pro
+++ b/src/pdf/pdf.pro
@@ -4,9 +4,10 @@ TEMPLATE = subdirs
 pdfcore.file = pdfcore.pro
 pdfcore_generator.file = pdfcore_generator.pro
 gn_run.file = gn_run.pro
-
+pdfcore_prl_generator.file = pdfcore_prl_generator.pro
 gn_run.depends = pdfcore_generator
-pdfcore.depends = gn_run
+pdfcore_prl_generator.depends = gn_run
+pdfcore.depends = pdfcore_prl_generator
 quick.depends = pdfcore
 
 !qtConfig(webengine-qtpdf-support):qtConfig(build-qtpdf)::!build_pass {
@@ -23,6 +24,7 @@ quick.depends = pdfcore
     SUBDIRS += \
         pdfcore_generator \
         gn_run \
+        pdfcore_prl_generator \
         pdfcore \
         quick
 }
diff --git a/src/pdf/pdfcore.pro b/src/pdf/pdfcore.pro
index c87722b7e..2dfe39dc0 100644
--- a/src/pdf/pdfcore.pro
+++ b/src/pdf/pdfcore.pro
@@ -17,33 +17,6 @@ INCLUDEPATH += $$QTWEBENGINE_ROOT/src/pdf \
 DEFINES += QT_BUILD_PDF_LIB
 win32: DEFINES += NOMINMAX
 
-linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri
-!include($$linking_pri) {
-    error("Could not find the linking information that gn should have generated.")
-}
-
-isEmpty(NINJA_OBJECTS): error("Missing object files from QtPdf linking pri.")
-isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtPdf linking pri")
-isEmpty(NINJA_LIBS): error("Missing library files from QtPdf linking pri")
-
-NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS))
-RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp
-for(object, NINJA_OBJECTS): RSP_CONTENT += $$object
-write_file($$RSP_FILE, RSP_CONTENT)
-
-macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE)
-linux:LIBS_PRIVATE += @$$RSP_FILE
-
-# QTBUG-58710 add main rsp file on windows
-win32:QMAKE_LFLAGS += @$$RSP_FILE
-
-!isEmpty(NINJA_ARCHIVES) {
-    linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group
-    else: LIBS_PRIVATE += $$NINJA_ARCHIVES
-}
-
-LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS
-
 QMAKE_DOCS = $$PWD/doc/qtpdf.qdocconf
 
 gcc {
@@ -54,7 +27,21 @@ msvc {
     QMAKE_CXXFLAGS_WARN_ON += -wd"4100"
 }
 
-ios: OBJECTS += $$NINJA_OBJECTS
+include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri)
+
+# install static dependencies and handle prl files for static builds
+
+static:!isEmpty(NINJA_ARCHIVES) {
+    static_dep_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}_static_dep.pri
+    !include($${static_dep_pri}) {
+        error("Could not find the prl information.")
+    }
+    ninja_archives = $$eval($$list($$NINJA_ARCHIVES))
+    ninja_archs_install.files = $${ninja_archives}
+    ninja_archs_install.path = $$[QT_INSTALL_LIBS]/static_chrome
+    ninja_archs_install.CONFIG = no_check_exist
+    INSTALLS += ninja_archs_install
+}
 
 SOURCES += \
     qpdfbookmarkmodel.cpp \
diff --git a/src/pdf/pdfcore_prl_generator.pro b/src/pdf/pdfcore_prl_generator.pro
new file mode 100644
index 000000000..39fdaed40
--- /dev/null
+++ b/src/pdf/pdfcore_prl_generator.pro
@@ -0,0 +1,27 @@
+
+qtConfig(debug_and_release): CONFIG += debug_and_release
+
+TARGET = QtPdf
+TEMPLATE = aux
+
+build_pass|!debug_and_relase {
+      linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri
+      !include($$linking_pri) {
+          error("Could not find the linking information that gn should have generated.")
+      }
+
+      !isEmpty(NINJA_ARCHIVES) {
+          prl_file = $$OUT_PWD/$$getConfigDir()/$${TARGET}_static_dep.pri
+          ninja_archives = $$eval($$list($$NINJA_ARCHIVES))
+          qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
+          for(ninja_arch, ninja_archives) {
+              ninja_arch_name = $$basename(ninja_arch)
+              ninja_arch_dirname = $$dirname(ninja_arch)
+              prl_content += "ninja_arch_prl_replace_$${ninja_arch_name}.match = $${ninja_arch_dirname}"
+              prl_content += "ninja_arch_prl_replace_$${ninja_arch_name}.replace = $${qqt_libdir}/static_chrome"
+              prl_content += "ninja_arch_prl_replace_$${ninja_arch_name}.CONFIG = path"
+              prl_content += "QMAKE_PRL_INSTALL_REPLACE += ninja_arch_prl_replace_$${ninja_arch_name}"
+          }
+          write_file($${prl_file}, prl_content)
+      }
+}
diff --git a/src/pdf/quick/quick.pro b/src/pdf/quick/quick.pro
index bd6bc8827..47c559091 100644
--- a/src/pdf/quick/quick.pro
+++ b/src/pdf/quick/quick.pro
@@ -36,5 +36,5 @@ HEADERS += \
     qquicktableviewextra_p.h \
 
 QT += pdf pdf-private gui core qml quick quick-private
-
+include($${OUT_PWD}/../$$getConfigDir()/QtPdf_static_dep.pri)
 load(qml_plugin)