<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99450f0bdff78262168edd874efb0846e6bc4866">https://github.com/macports/macports-ports/commit/99450f0bdff78262168edd874efb0846e6bc4866</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 99450f0bdff qt5: update version 5.15.6->5.15.8
</span>99450f0bdff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99450f0bdff78262168edd874efb0846e6bc4866
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Jan 3 20:55:43 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update version 5.15.6->5.15.8
</span>---
aqua/qt5/Portfile | 284 ++++-----
aqua/qt5/files/patch-pc_files.diff | 2 +-
.../files/patch-qiosurfacegraphicsbuffer.h.diff | 17 -
...he-architecture-when-using-qmake-installed.diff | 67 --
...86_64-as-the-architecture-when-using-qmake.diff | 159 -----
.../patch-qt5-qtwebengine-RectF-ambiguous.diff | 58 --
aqua/qt5/files/patch-qt515-highsierra1.diff | 2 +-
.../files/patch-qtwebengine_syncqt.pl_headers.diff | 704 ---------------------
devel/gn-devel/Portfile | 10 +-
9 files changed, 141 insertions(+), 1162 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56f281a58d3..2febdcd93da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_version 5.15.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.8
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,14 +45,14 @@ master_sites \
</span> # latest qtwebengine 5.15.x releases are only tagged on git
if { ${subport} in [list "${name}-qtwebengine" "${name}-qtwebengine-docs"] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.15.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.12
</span> # set revision in module info below
# fetch archives generated by GitHub mirrors: repository uses submodule qtwebengine-chromium
# which has to be fetched separately and extracted into src/3rdparty
set qtwebengine_ref v${version}-lts
# keep this ref synchronized with qt5-qtwebengine-gn to allow distfile reuse
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qtwebengine_chromium_ref be349eaf62e77955791d7bf29f893f1e8a37daf4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref e0fd3a5d3ce79d43dee6e0bad16a71123d9a14b3
</span>
distname qtwebengine-${version}-lts
set qtwebengine_distfile ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,13 +68,13 @@ if { ${subport} in [list "${name}-qtwebengine" "${name}-qtwebengine-docs"] } {
</span> https://github.com/qt/qtwebengine-chromium/archive/${qtwebengine_chromium_ref}:tagtwo
checksums ${qtwebengine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c068eb75cf54544752a7fb91e83fa4089be5f2ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aa7466356c450c5f5870f979b93cd7e7e62da1165c328ffcab1a9928db18ad67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3776823 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a8fc1dd8bd82e7327208c0314a5154a2b2df1eaa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f7fa6df50238a118c5a36fe398b4543ba30129a22ddfe0365f5472e800f5268c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3777385 \
</span> ${qtwebengine_chromium_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d1c2147e3aa333911e78c8bd4923306177716b71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f47ed8ab8cc062411f6f206da6353bc8263d6ed6d6290c689a05c01d91f646b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462213935
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d406d6f6386638fab83d98c02949f7a15b94fad4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 40280a8c77bb00888e97774e7b3ab37587eecb92633d2ed42750690a9b0b7573 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462748015
</span>
# Using system ninja: no need to extract bundled ninja
extract.post_args-append --exclude=${distname}/ninja/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +89,6 @@ if { ${subport} in [list "${name}-qtwebengine" "${name}-qtwebengine-docs"] } {
</span> move ${workpath}/${qtwebengine_chromium_distname} ${worksrcpath}/src/3rdparty
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/66165
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt5-qtwebengine-RectF-ambiguous.diff
</span> # https://trac.macports.org/ticket/66219
patchfiles-append patch-qt5-qtwebengine-CGRect-undefined.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,9 +191,9 @@ set llvm_version 15
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 45134b0c746023e126c3c9788309ea9748a154da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0415844bdff6505b549c624961ab475543abf0a02d39230a34be61a02922bce5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 81928680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d3599284431c3d6892f36245a94f84873b1709eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4bbb99b943870544bfbbe0760088d3443f0746484e19c858579f019e28d90ba2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 118248320
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,9 +206,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ed76cba24f23f04e45b3a8319ddae25d1ca0684
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50240276
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4210b7ea24281c6e70559df429678d12d7b120af
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bfb11126c7f3abc3fdf86425ce912988b864a7e79a606d77325cffdbacb4be9c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50259432
</span> }
""
"port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 path:lib/pkgconfig/icu-uc.pc:icu port:pcre2 path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:double-conversion port:zstd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,14 +216,14 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bc3d2a97f1c23ddfc6b09cc6ce8cacaa665ca07f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fdf8345b939c5dc39254b1bfb69d778e0563c23a3d0112d9509f9ceeae6cfa1d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4254060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e1c2887bb9f07ab2a38860d9e57101452c0d330a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9456ed8943286959f56d075db4d3b3ff9a271ec85b0b3de3e038d164a65521e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4254148
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,9 +236,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0e0fcb001ce6efff1358f56d3538e3a45fb47fb9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c1c59a6593be9f56fde3285bc3dae4419946a28c5222d1ccf70ee11efecf40d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2817924
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f6466ad533bb994e795e8a86e1c784e77e3ed4a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ccba61ca34ee00ecf51fd3ed9fb19617fd706d8a684068bb649cf973de7cd8c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2822448
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,9 +251,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f741b519e224dec3c6aa1c7301852b6be3a5735c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ccf4f8d933eec577109fdff7f7ed4fcc895f808440c7d21f278f4bce3db04c3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5193396
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 455c4e8bd24be2a045a065c3ccfac246ae7638e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b06558f6e000e04814b3349bd015dd7ee32553c9f7519eb49cb94305759b22d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193552
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,11 +266,11 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dd993223b769fe0e9861e695b0866da6c4834a86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6800b2b79535cffeac4cfa4545d68f4e2ca6b606db8b10219350e9a0c7c6b61d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21587108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d0b0bf3e40bfb3fb5faad72d01102bc5bbe4e10d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 026ec083b9b5f98c78b6cf38c95ca5351b374f8dd7f3e815f0d3d67d82b468cd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21592984
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python311"
</span> ""
"qtbase qtsvg"
{"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,9 +281,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f1abe8af1b20562335d96a8fa903b83e00552b86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a1986b8d216ad881fa678563df0abb1d6a1c74634e6b7167a6dfe1363a88ef2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5766140
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fbbcbeb5d9f55dfe70f7e993f0606a5fa4e60e3c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c61ff32310b1f7ec2695b43051028a0deba103a715fcd472f4da63e558bf1a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5767748
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,9 +296,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 95c2a255be2299b650230ab2794bd3c756e55f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8d904f3d5d4af917473f550d5ae275d293a037f7fc4e12ff8de7828c1184cfa9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 388756
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b81be7d59c56e828ea5439207697656292372aec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 735f7dedbaa2f2bdbd2bb2f67599fef2f13bdd97543ccd131053d1335fbefd6d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 388800
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,9 +311,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b6932c887d889b8a835e1aeef34ee0ae3936119e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dad9a5f8a414c8aa21dddacb7558386d8e844b6c622b101276ec82bcd0320366
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14043564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6c8e722856f4090fd62052ac21e93aac867da0f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 49aeb89d1a0399a47eec063e581ab042bad1e6445fa48651c072a6105194d773
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14043772
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,9 +326,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 904cc4278bb4b5da6f77fb8003e87018804725bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4cbc9318fb532d0fa9a147460c053d1dfc0aca019dfda271197d93e863404e5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1837328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ade7397562acb3da2de0e7e8cced396a4f51a324
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 61440ef3b0d06ef8cd6e7e297828097d885097139d9be26d9c0b16ce7ec2ce30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1843016
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,14 +336,14 @@ array set modules {
</span> {"Qt Image Formats"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4449c52cb99c738924bec98e02e498a91a1d019e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 523ebe20028ebaa537b1ea2d4b3a3d3629126b26b235a2876fdb7e38a063dc2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6558128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5ef6c33c0a70dbef527540dc33f785b80218d847
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3ccb4bcf870bc1c663623315d3dc8f786c3ca63ce6df4794ddfcba0b7cc72664
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6559180
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,14 +351,14 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c8576f974993d28f0729414e302e7e325e3dcd65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ad5acb59c8b8f10529885b1ee583ebbd85010be8d5c02b6092fba7842ca7b733
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f8364da34240044041c65c893c00b5c114ce3f07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a18a63a0391c11fadb8dc4176ce9950bbb15ade8770cd31b8cae59071fd4b2b5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84136
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,9 +371,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bfff3cb63eef3caf4b0b746210a87720d1205ea8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ce3b4a9d4abc6060007adaf8d335cae4d9323eaa3a2eea338de98e6b4089f44a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 71240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8db2154ccdeb54bf5dc360c801b863086150c90c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e57650f557742034b27f4ca02173ba68977517dd46eec826b420aa6744f7086e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71312
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -388,9 +386,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f574f0e87040b35347b287ff0cc524290b3bc5e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d60b9c6dc927547db5af09fd133099b5361444cb7e329a8b271980512e03304d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3830456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f770e9f3e433fbda721c75887f9ba30984675d9a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3347791521b106d1e69ac0b28ea9a295c06dddcf592c051d366fedc9ae73e0bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3833148
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,9 +401,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4e62ac4d2c42229fe3fbc394d499eb133f816b1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3d654cb5799ca0199c0186d67c17cb900d91372a3596beb68a96019dc241e849
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 143428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75bab77d2532c7a196f3d1d0b602b1aef13a6c56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 854127960477daddde3051211756d52708f9827ea751a80312c3ff3fb9bc553b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 143564
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,9 +416,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a5b315d829b2352e849b679a07f37c282ae64804
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b91ea2376f25c6a401bee67da439269bbe393f79d3e89e2f676d323936654c4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 210476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 672f8f87ecedc20aa222300f25db7edf827ab083
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 883358575e1ed6908afe8fa3675c02d1a85b72a072bc6114f9d0a7c76cf1532e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 308540
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,9 +431,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1bfddb793fcca74fd779735ee0aa8cb268e23939
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3d339dfbf5a88122da85438de489e3e6720fa0d643822c6531af7b8cb8ba29a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55773664
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f747d2a3abb1d02e85d00930fecb152c1476562f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1dfe98c5ec69f7a282c8d6bf129cdcc6153873bd2f1b2bf2ca20568dea3a692c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55765152
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,9 +446,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9e5353cd5b7b4bd28a681d3dbbec1bbf8f9908e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caf2e06da4776d43cd81f63851001802431b721b3aae4c43b8d344afbb6ce453
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5985792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1e1ee001d0637094c146e7c20644b3aaf3cdc9d0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2cb762d8aa53dacced4ddcc038c4541179c8bee51902becdd1753237ef3ae47a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5985268
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,9 +461,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 773e9bacdba1a0636be174984600cf0d279c5a27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1ca3246037b7e2718891b17b720f28048770c95fabca50abf4e29d0f45857c27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8291236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 390c6ee9f7f1141e4cbf072eae61d7b9696d9f3a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 652e71e5d068c2eb0a31716af08cebaf20a979d5bd8e6ff721ea8b238c9c0d15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8292476
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -478,9 +476,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 136f5fb4abe9ad47f898e2c8cf6cdcb156d8c688
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f99fa62431c016eedcf75e7b21c0118cc0a7e14628febb4444bd858af07b1b35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 80204afb7779b2e1dbb0f4d59e32917a485f6820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 298473fca0d2113de7422e5b7cb7605d8961652ee3af98c8753f979b5f52706a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104348
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,9 +491,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fec03bc4baef84deaca0751a8988058687faa9c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0e949c92e3d8bb3c127008cffc68d8ff8fb7e3ec0a7cd0ece8b06434876e8977
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 377660
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4b70ea09f322c34317b6b516fd72b100452b0bcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a4c83f796a7bb52f97a23ac4bd7f6718e14274e4c55d14549b9a317fe3f729ae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 378928
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -508,9 +506,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c6b3d447bb64c30041a50506f831504eb47f8fa4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3cf55b10605825d8acd0380ea2c5a50e3d081f9fda8900cc903fff2fc8b290ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2663920
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3658ff2fa8457e094c1fea690a63c1dd05c51a56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9ad546f081d479c73dbdd16c567076dc8763d4ef3a7e0b3e06b87107ec0d5266
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2665424
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -523,9 +521,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3c9243b2850ba03417ba6f5e4b17b2e5a2697ea0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f01b2058634a702796942ec5e70974afc7947dc7c014118af47421a74b7f723
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 436724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 186df7ee26057dac208768a094634b48c3dead56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 36d46988ece57051258328a58cc2fc0ece7a880dd0ed8ab3a703a3fcf6b5469e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 436864
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -538,9 +536,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 93ed5c08be521b57b4cbb38418008b8f9290d387
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bf8034647f678266f16e0990eac3645363437b35d513290c829999e7612182c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2058784
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fec2e4aa9c5a88d5f480433d2fc42d67a4f09af1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a654374a459a53ed946789b672d8be266d883f034c7976a3674af63de37ab7b9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2058928
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -553,9 +551,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7ea5d3d46d26b5654991600cd540aa14f87d4841
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3598f923eb9a580c92f8700a336ed6e0794b2b03dca944a40663e9dbfba05659
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 358352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3c6794eb6b1cbb76e6d87f5bd9718c3fbb914823
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e094bfe9430468eee6e717d179ea987ee9e81f2c0a038c66220e3d7297bc4373
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 358400
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -568,9 +566,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b7e6fbe359fae47ce46361d63f9dd41f58c4f108
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9272ad9ef426dd417eb0ef76d56df0352dae601c74af42e13e5ed23491244775
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 323288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8c5151b8ae7244d0d187b60348db9ae1b59632f9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5beca29ffb31225f9e3a9a3b909cb96efc557c17dcef3467235c075a7dbb2812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 323200
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -583,9 +581,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1a8b3930a92c87800bbcc5b2243a732d1581e3ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- adb2106c95a98f8395eeff3352d9045a8faa4edec6b9dba0a18cdea5a51065f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 103504
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d9b9a1d4efb3c98fb360cfca08b51c40fdcb640e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e6160e0d6087aaed28c11e9f550f23d156008066cffc2245e9ba007da4a7a6e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 103728
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,9 +596,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4941e1385da35536d9cbf26fe3a576f42168bb7d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 523a816ce8dc33b60284ff6fcf173421b16ee8adde2c55541fad2bd6bf2a7199
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1889056
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f07c7bafb1824e52f030574c1e936836a634da30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9c2fba3e7fd06ee629b159804703466469679e3153f5c313c6e42a59ee66d562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1888824
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,9 +611,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8734aa194d630f51c8e4582a39a3807a82f32708
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8898812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0346746eccf51a33a8817e302da2deb9d60452fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a3bef8de13032dae17450f5df35e8abbb4f41f71e3b628871d3da5633577e9c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8898368
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -623,14 +621,14 @@ array set modules {
</span> {"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 58891a25375a5fb2743f9c804a398aa1d72fe622
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 295ba009b0709fc59aeff3ec9973e7664f3e1885252a71d63d264e6e6a7dbc33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1618952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e110d6d74d357e938ad99a1cf73e6ef47ddb0f47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0b28cc71185adbc2e6f99b45ca78f7cfa1be5202b6d2977c3f044f243a943b55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1634516
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -643,9 +641,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5423ff8d1c85c36065e7f5ed7ce0b6e3aa228f6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2aab78e3b2073eb304243f08f84c9a80fde08b2968b545c56eff6329d0f4610f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10958608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1ff5578c57cda6fc1c23667f0d29c0a5ebc62a16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a7e563bc35bcebe945dba3f25b626d423c58981c9d4344394783548213946dea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10965644
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -658,9 +656,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 55a426ca70e29abeb5766ade29c0ff84ca772a53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ddf4b1364fdaae7f6c2166ecc4400a58692fce74f31737407d0af9ff7f7db5cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 210672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 241bbcd888a6fa44637d46662a2656aa23e5d3c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f6e5e806f6d04e4dfdb00a1cec40757aef11fc3019a4b2245787e8889df1d5dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 210788
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -679,14 +677,14 @@ array set modules {
</span> {"Qt WebEngine"}
"very large and relatively new"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c307f43e3bd9ec8ef6a79f5f985c31298aa7fdab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- af0aa699c42faf571731ed3e4649c199e5c2b20d8424ac55ee60a232feecf154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 75860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 41f1d97cd9947458c1560cc9da3cea77eb055099
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c1ae7ba6b2fdfe8faedb88395d3a7cdcac5e94f4e5b9105eb96d9662dd837fbf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75876
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -729,9 +727,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 689872f8d03129b214c2bb8fd24cae373ad12c52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 63d471d2d4c999d5fa96cb737b9afc58c7a47abedd1f008f993382cd0e89ac13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 260696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 248fe06d927ca8d4a96de1d38cc33da366385a0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ea9231b5cc4c9437c568605873d6eb97f09a4009d70cece793f40a792910058a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 260804
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -744,9 +742,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 73226d0dc4e5e610e17547ef7187a916044f4fd5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd27bd1b34a35bf497f3a63d40eef0c4702774fcbc56ba09a904fef41ff34f88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 135320
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fcada0c2594aadbef384e0f8fbdb7992932054e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 72a67812ca30fb08edbb8d1edb3fdf31a4ad0f2b20e451a2b08020e7e86f03ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 135372
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,9 +757,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bdfa2307694d9cf85b684b0583a5ff4751b12f7d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e71e3de9d2feb3c4e6e4000e4a0046ab26549e8e42f977cc623f39a63c1d56fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5215904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a9ea82f6a8596f9d6179500d1348e2d871146904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 65e0f666234752d9f4e2835fee219ae6860f9daabaf18b953ba52831b23acec6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5210520
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1091,20 +1089,9 @@ foreach {module module_info} [array get modules] {
</span> # this patch is specific to version 5.15
patchfiles-append patch-qt515-highsierra1.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # upstream patch to allow for non-x86_64 builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/qt/qtbase/commit/9082cc8e8d5a6441dabe5e7a95bc0cd9085b95fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and also patch the mkspecs we are going to install as well
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake-installed.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/63805#comment:13
patchfiles-append patch-sdk-no-stderr.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Backported upstream patch to build with the macOS 12 SDK.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/qt/qtbase/commit/dece6f5840463ae2ddf927d65eb1b3680e34a547
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1804,22 +1791,9 @@ foreach {module module_info} [array get modules] {
</span> # run syncqt.pl to generate headers needed to build from git snapshot (rather than release tarball)
# system Perl is sufficient, since syncqt.pl only uses standard core modules
# (although future macOS may not include Perl)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "/usr/bin/perl ${prefix}/libexec/${name}/bin/syncqt.pl -version ${version} ."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # alternatively, apply syncqt.pl output from a patch to avoid build dependency on perl
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set syncqt_patch patch-qtwebengine_syncqt.pl_headers.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set hex_version [format "0x%02X%02X%02X" {*}[split ${version} "."]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "$UI_PREFIX Applying ${syncqt_patch} (using sed)"
</span> system -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "/usr/bin/sed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e 's|@@QTWEBENGINE_VERSION@@|${version}|g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e 's|@@QTWEBENGINE_VERSION_HEX@@|${hex_version}|g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/${syncqt_patch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | /usr/bin/patch -p0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/bin/perl ${prefix}/libexec/${name}/bin/syncqt.pl -version ${version} ."
</span> }
# chromium/base/process/process_metrics_mac.cc assumes PAGE_SIZE is a constexpr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2214,6 +2188,16 @@ foreach deps ${depends_check} {
</span> #
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string first ":python311" ${deps}] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If Qt components use Python 3, ensure that MacPorts python311 is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a better solution would be to force components to use a specific python program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # how to accomplish such a thing is not entirely clear
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see #49838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if { ${python_framework} ne "" } {
configure.env-append PATH=${python_framework}/bin:$env(PATH)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 204cd588048..1c49daf8a62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- qmake/generators/makefile.cpp.orig 2018-12-03 04:15:26.000000000 -0700
+++ qmake/generators/makefile.cpp 2018-12-22 06:02:13.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3392,7 +3392,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3423,7 +3423,7 @@
</span> t << "-I${includedir}";
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
&& libDir != QLatin1String("/Library/Frameworks")) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qiosurfacegraphicsbuffer.h.diff b/aqua/qt5/files/patch-qiosurfacegraphicsbuffer.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fa2ad91d008..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e070ba977d55..cc7193d8b71b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qpa/qplatformgraphicsbuffer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <private/qcore_mac_p.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreGraphics/CGColorSpace.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <IOSurface/IOSurface.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.33.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake-installed.diff b/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake-installed.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7821cae06e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake-installed.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From <https://github.com/qt/qtbase/commit/9082cc8e8d5a6441dabe5e7a95bc0cd9085b95fe>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch is for the mkspecs that we are going to install with qt5-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mkspecs-save/common/macx.conf mkspecs-save/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1f99c8ff5ab..1b8bbbe047c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs-save/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs-save/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_APPLE_DEVICE_ARCHS = x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Should be 10.15, but as long as the CI builds with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # older SDKs we have to keep this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mkspecs-save/features/mac/default_post.prf mkspecs-save/features/mac/default_post.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 92a9112bca6..d888731ec8d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs-save/features/mac/default_post.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs-save/features/mac/default_post.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,6 +90,11 @@ app_extension_api_only {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Non-universal builds do not set QMAKE_APPLE_DEVICE_ARCHS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# so we pick it up from what the arch test resolved instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+isEmpty(QMAKE_APPLE_DEVICE_ARCHS): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macx-xcode {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,9 +150,6 @@ macx-xcode {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- isEmpty(VALID_ARCHS): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mkspecs/features/toolchain.prf mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2a1f7cba3dd..0040b6c4b9f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs-save/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs-save/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,9 +182,14 @@ isEmpty($${target_prefix}.INCDIRS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # UIKit simulator platforms will see the device SDK's sysroot in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Clang doesn't pick up the architecture from the sysroot, and will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # default to the host architecture, so we need to manually set it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cxx_flags += -arch $$QMAKE_APPLE_DEVICE_ARCHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uikit {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Clang doesn't automatically pick up the architecture, just because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # we're passing the iOS sysroot below, and we will end up building the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # test for the host architecture, resulting in linker errors when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # linking against the iOS libraries. We work around this by passing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # the architecture explicitly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cxx_flags += -arch $$first(QMAKE_APPLE_DEVICE_ARCHS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uikit:macx-xcode: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cxx_flags += -isysroot $$sdk_path_device.value
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff b/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ce741555cbd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,159 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From <https://github.com/qt/qtbase/commit/9082cc8e8d5a6441dabe5e7a95bc0cd9085b95fe>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9082cc8e8d5a6441dabe5e7a95bc0cd9085b95fe Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 4 Dec 2020 17:29:06 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] macOS: Don't hard-code x86_64 as the architecture when using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The qmake variable QMAKE_APPLE_DEVICE_ARCHS was added for iOS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to support universal builds, as the QT_ARCH is a single value.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since the qmake macOS builds are non-universal (at the moment),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-we remove the hard-coded value for QMAKE_APPLE_DEVICE_ARCHS on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macOS, and let the normal architecture test resolve the arch,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-like on other platforms.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To ensure that the following configuration tests are run with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-an -arch argument, we trigger a commit of the preliminary Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configuration after running the architecture test. This is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-strictly necessary, but makes it clearer what's going on during
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The device_and_simulator configuration option was used by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-iOS toolchain, and needed to be moved up in the configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test order to not break later tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The logic in mac/default_post.prf for both Xcode and Makefiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to add -arch flags was kept as is, based on the existing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variable, to avoid too many changes to this logic.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The logic in toolchain.prf was amended to make it clear and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ensure that it only applies to iOS builds. macOS builds do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not have this issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Pick-to: 6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Pick-to: 5.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Pick-to: 5.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I70db7e4c27f0d3da5d0af33cb491d72c312d3fa8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.json | 13 ++++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pri | 7 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/common/macx.conf | 1 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/features/mac/default_post.prf | 8 +++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/features/toolchain.prf | 11 ++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5 files changed, 30 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.json configure.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29afbac43d5..a9249e1ed29 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,11 +244,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "testTypeDependencies": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "linkerSupportsFlag": [ "use_bfd_linker", "use_gold_linker", "use_lld_linker" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "verifySpec": [ "shared", "use_bfd_linker", "use_gold_linker", "use_lld_linker", "compiler-flags", "qmakeargs", "commit" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "verifySpec": [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "shared",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "use_bfd_linker", "use_gold_linker", "use_lld_linker",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "compiler-flags", "qmakeargs",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "simulator_and_device",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "thread",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "commit" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "compile": [ "verifyspec" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "detectPkgConfig": [ "cross_compile", "machineTuple" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "library": [ "pkg-config", "compiler-flags" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "getPkgConfigVariable": [ "pkg-config" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "getPkgConfigVariable": [ "pkg-config" ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "architecture" : [ "verifyspec" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "testTypeAliases": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -762,7 +769,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "architecture": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "label": "Architecture",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "output": [ "architecture" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "output": [ "architecture", "commitConfig" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "pkg-config": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "label": "Using pkg-config",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.pri configure.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a04aa172366..f55b7cb448d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -662,6 +662,13 @@ defineTest(qtConfOutput_commitOptions) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write_file($$QT_BUILD_TREE/mkspecs/qdevice.pri, $${currentConfig}.output.devicePro)|error()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Output is written after configuring each Qt module,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# but some tests within a module might depend on the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# configuration output of previous tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+defineTest(qtConfOutput_commitConfig) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qtConfProcessOutput()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # type (empty or 'host'), option name, default value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defineTest(processQtPath) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out_var = config.rel_input.$${2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mkspecs/common/macx.conf mkspecs/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1f99c8ff5ab..1b8bbbe047c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_APPLE_DEVICE_ARCHS = x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Should be 10.15, but as long as the CI builds with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # older SDKs we have to keep this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mkspecs/features/mac/default_post.prf mkspecs/features/mac/default_post.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 92a9112bca6..d888731ec8d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/default_post.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/default_post.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,6 +90,11 @@ app_extension_api_only {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Non-universal builds do not set QMAKE_APPLE_DEVICE_ARCHS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# so we pick it up from what the arch test resolved instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+isEmpty(QMAKE_APPLE_DEVICE_ARCHS): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macx-xcode {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,9 +150,6 @@ macx-xcode {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- isEmpty(VALID_ARCHS): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mkspecs/features/toolchain.prf mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2a1f7cba3dd..0040b6c4b9f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,9 +182,14 @@ isEmpty($${target_prefix}.INCDIRS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # UIKit simulator platforms will see the device SDK's sysroot in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Clang doesn't pick up the architecture from the sysroot, and will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # default to the host architecture, so we need to manually set it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cxx_flags += -arch $$QMAKE_APPLE_DEVICE_ARCHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uikit {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Clang doesn't automatically pick up the architecture, just because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # we're passing the iOS sysroot below, and we will end up building the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # test for the host architecture, resulting in linker errors when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # linking against the iOS libraries. We work around this by passing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # the architecture explicitly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cxx_flags += -arch $$first(QMAKE_APPLE_DEVICE_ARCHS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uikit:macx-xcode: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cxx_flags += -isysroot $$sdk_path_device.value
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff b/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd303877741..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e41a894fc..be79bf7cf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -629,7 +629,10 @@ gfx::RectF TextFinder::ActiveFindMatchRect() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!current_active_match_frame_ || !active_match_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return gfx::RectF();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// return gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGRect r = FindInPageRectFromRange(EphemeralRange(ActiveMatch()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return gfx::RectF(r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Vector<gfx::RectF> TextFinder::FindMatchRects() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -639,7 +642,10 @@ Vector<gfx::RectF> TextFinder::FindMatchRects() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- match_rects.ReserveCapacity(match_rects.size() + find_matches_cache_.size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (const FindMatch& match : find_matches_cache_) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DCHECK(!match.rect_.IsEmpty());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- match_rects.push_back(match.rect_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// match_rects.push_back(match.rect_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGRect r = match.rect_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ match_rects.push_back(r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return match_rects;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 48d06120e..e7963b327 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,7 +320,9 @@ FloatRect PaintTimingDetector::BlinkSpaceToDIPs(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // May be nullptr in tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!widget)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return float_rect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGRect r = float_rect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(r)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FloatRect PaintTimingDetector::CalculateVisualRect(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f7a348c81..45de8d332 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1480,7 +1480,9 @@ void WebAXObject::GetRelativeBounds(WebAXObject& offset_container,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private_->GetRelativeBounds(&container, bounds, container_transform,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clips_children);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- offset_container = WebAXObject(container);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bounds_in_container = gfx::RectF(bounds);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //bounds_in_container = gfx::RectF(bounds);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGRect r = bounds;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bounds_in_container = gfx::RectF(r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void WebAXObject::GetAllObjectsWithChangedBounds(
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qt515-highsierra1.diff b/aqua/qt5/files/patch-qt515-highsierra1.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index efda7a0b8eb..7cd352f08a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qt515-highsierra1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qt515-highsierra1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/corelib/kernel/qcore_mac.mm.orig
+++ src/corelib/kernel/qcore_mac.mm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,16 +262,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,16 +263,20 @@
</span>
#ifdef QT_DEBUG
void *poolFrame = nullptr;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_syncqt.pl_headers.diff b/aqua/qt5/files/patch-qtwebengine_syncqt.pl_headers.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 315377a9e08..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_syncqt.pl_headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,704 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdfdestination_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdfdestination_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdfdocument_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdfdocument_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdflinkmodel_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdflinkmodel_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdflinkmodel_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdflinkmodel_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdfsearchmodel_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdfsearchmodel_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdfsearchresult_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdfsearchresult_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/@@QTWEBENGINE_VERSION@@/QtPdf/private/qpdfselection_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdf/api/qpdfselection_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfBookmarkModel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfbookmarkmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfDestination
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfdestination.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfDocument
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfdocument.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfDocumentRenderOptions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfdocumentrenderoptions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfPageNavigation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfpagenavigation.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfPageRenderer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfpagerenderer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfSearchModel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfsearchmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfSearchResult
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfsearchresult.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QPdfSelection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfselection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QtPdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTPDF_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTPDF_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QtPdf/QtPdfDepends>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtpdfglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfbookmarkmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfdestination.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfdocument.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfdocumentrenderoptions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfnamespace.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfpagenavigation.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfpagerenderer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfsearchmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfsearchresult.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfselection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtpdfversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/QtPdfVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtpdfversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/headers.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.HEADER_FILES = api/qpdfbookmarkmodel.h api/qpdfdestination.h api/qpdfdocument.h api/qpdfdocumentrenderoptions.h api/qpdfnamespace.h api/qpdfpagenavigation.h api/qpdfpagerenderer.h api/qpdfsearchmodel.h api/qpdfsearchresult.h api/qpdfselection.h api/qtpdfglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.GENERATED_HEADER_FILES = QPdfBookmarkModel QPdfDestination QPdfDocument QPdfDocumentRenderOptions QPdfPageNavigation QPdfPageRenderer QPdfSearchModel QPdfSearchResult QPdfSelection qtpdfversion.h QtPdfVersion QtPdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.PRIVATE_HEADER_FILES = api/qpdfdestination_p.h api/qpdfdocument_p.h api/qpdflinkmodel_p.h api/qpdflinkmodel_p_p.h api/qpdfsearchmodel_p.h api/qpdfsearchresult_p.h api/qpdfselection_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.CLEAN_HEADER_FILES = api/qpdfbookmarkmodel.h api/qpdfdestination.h api/qpdfdocument.h api/qpdfdocumentrenderoptions.h api/qpdfnamespace.h api/qpdfpagenavigation.h api/qpdfpagerenderer.h api/qpdfsearchmodel.h api/qpdfsearchresult.h api/qpdfselection.h api/qtpdfglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.INJECTIONS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfbookmarkmodel.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfbookmarkmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfdestination.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfdestination.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfdocument.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfdocument.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfdocumentrenderoptions.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfdocumentrenderoptions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfnamespace.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfnamespace.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfpagenavigation.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfpagenavigation.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfpagerenderer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfpagerenderer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfsearchmodel.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfsearchmodel.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfsearchresult.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfsearchresult.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qpdfselection.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qpdfselection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qtpdfglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdf/api/qtpdfglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdf/qtpdfversion.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* This file was generated by syncqt. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTPDF_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTPDF_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTPDF_VERSION_STR "@@QTWEBENGINE_VERSION@@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTPDF_VERSION @@QTWEBENGINE_VERSION_HEX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // QT_QTPDF_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/@@QTWEBENGINE_VERSION@@/QtPdfWidgets/private/qpdfview_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/pdfwidgets/qpdfview_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/QPdfView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfview.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/QtPdfWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTPDFWIDGETS_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTPDFWIDGETS_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QtPdfWidgets/QtPdfWidgetsDepends>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtpdfwidgetsglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qpdfview.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtpdfwidgetsversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/QtPdfWidgetsVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtpdfwidgetsversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/headers.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.HEADER_FILES = qpdfview.h qtpdfwidgetsglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.GENERATED_HEADER_FILES = QPdfView qtpdfwidgetsversion.h QtPdfWidgetsVersion QtPdfWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.PRIVATE_HEADER_FILES = qpdfview_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.CLEAN_HEADER_FILES = qpdfview.h qtpdfwidgetsglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.INJECTIONS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/qpdfview.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdfwidgets/qpdfview.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/qtpdfwidgetsglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/pdfwidgets/qtpdfwidgetsglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtPdfWidgets/qtpdfwidgetsversion.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* This file was generated by syncqt. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTPDFWIDGETS_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTPDFWIDGETS_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTPDFWIDGETS_VERSION_STR "@@QTWEBENGINE_VERSION@@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTPDFWIDGETS_VERSION @@QTWEBENGINE_VERSION_HEX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // QT_QTPDFWIDGETS_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineaction_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineaction_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineaction_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineaction_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginecertificateerror_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginecertificateerror_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineclientcertificateselection_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginecontextmenurequest_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginedialogrequests_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginedialogrequests_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginedownloaditem_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginedownloaditem_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginedownloaditem_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginefaviconprovider_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginehistory_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginehistory_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginehistory_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginehistory_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineloadrequest_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineloadrequest_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginenavigationrequest_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginenavigationrequest_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginenewviewrequest_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginenewviewrequest_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineprofile_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineprofile_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginescript_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginescript_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginesettings_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginesettings_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginesingleton_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginesingleton_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginetestsupport_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginetestsupport_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineview_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineview_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qquickwebengineview_p_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qquickwebengineview_p_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/@@QTWEBENGINE_VERSION@@/QtWebEngine/private/qtwebengineglobal_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webengine/api/qtwebengineglobal_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/QQuickWebEngineProfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qquickwebengineprofile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/QQuickWebEngineScript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qquickwebenginescript.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/QtWebEngine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTWEBENGINE_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTWEBENGINE_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QtWebEngine/QtWebEngineDepends>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebengineglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qquickwebengineprofile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qquickwebenginescript.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebengineversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/QtWebEngineVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebengineversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/headers.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.HEADER_FILES = api/qquickwebengineprofile.h api/qquickwebenginescript.h api/qtwebengineglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.GENERATED_HEADER_FILES = QQuickWebEngineProfile QQuickWebEngineScript qtwebengineversion.h QtWebEngineVersion QtWebEngine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.PRIVATE_HEADER_FILES = api/qquickwebengineaction_p.h api/qquickwebengineaction_p_p.h api/qquickwebenginecertificateerror_p.h api/qquickwebengineclientcertificateselection_p.h api/qquickwebenginecontextmenurequest_p.h api/qquickwebenginedialogrequests_p.h api/qquickwebenginedownloaditem_p.h api/qquickwebenginedownloaditem_p_p.h api/qquickwebenginefaviconprovider_p_p.h api/qquickwebenginehistory_p.h api/qquickwebenginehistory_p_p.h api/qquickwebengineloadrequest_p.h api/qquickweben [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.CLEAN_HEADER_FILES = api/qquickwebengineprofile.h api/qquickwebenginescript.h api/qtwebengineglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.INJECTIONS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/qquickwebengineprofile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webengine/api/qquickwebengineprofile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/qquickwebenginescript.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webengine/api/qquickwebenginescript.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/qtwebengineglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webengine/api/qtwebengineglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngine/qtwebengineversion.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* This file was generated by syncqt. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTWEBENGINE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTWEBENGINE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTWEBENGINE_VERSION_STR "@@QTWEBENGINE_VERSION@@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTWEBENGINE_VERSION @@QTWEBENGINE_VERSION_HEX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // QT_QTWEBENGINE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/@@QTWEBENGINE_VERSION@@/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/core/api/qtwebenginecoreglobal_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/@@QTWEBENGINE_VERSION@@/QtWebEngineCore/private/qwebenginecallback_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/core/api/qwebenginecallback_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/@@QTWEBENGINE_VERSION@@/QtWebEngineCore/private/qwebenginecookiestore_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/core/api/qwebenginecookiestore_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/@@QTWEBENGINE_VERSION@@/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/core/api/qwebenginemessagepumpscheduler_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/@@QTWEBENGINE_VERSION@@/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/core/api/qwebengineurlrequestinfo_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineCallback
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecallback.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineClientCertificateStore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineclientcertificatestore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineCookieStore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecookiestore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineFindTextResult
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginefindtextresult.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineHttpRequest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginehttprequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineNotification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginenotification.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineQuotaRequest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginequotarequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineregisterprotocolhandlerrequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineUrlRequestInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlrequestinfo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineUrlRequestInterceptor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlrequestinterceptor.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineUrlRequestJob
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlrequestjob.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineUrlScheme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlscheme.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QWebEngineUrlSchemeHandler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlschemehandler.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QtWebEngineCore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTWEBENGINECORE_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTWEBENGINECORE_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QtWebEngineCore/QtWebEngineCoreDepends>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebenginecoreglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecallback.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineclientcertificatestore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecookiestore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginefindtextresult.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginehttprequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginenotification.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginequotarequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineregisterprotocolhandlerrequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlrequestinfo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlrequestinterceptor.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlrequestjob.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlscheme.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineurlschemehandler.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebenginecoreversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/QtWebEngineCoreVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebenginecoreversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/headers.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.HEADER_FILES = api/qtwebenginecoreglobal.h api/qwebenginecallback.h api/qwebengineclientcertificatestore.h api/qwebenginecookiestore.h api/qwebenginefindtextresult.h api/qwebenginehttprequest.h api/qwebenginenotification.h api/qwebenginequotarequest.h api/qwebengineregisterprotocolhandlerrequest.h api/qwebengineurlrequestinfo.h api/qwebengineurlrequestinterceptor.h api/qwebengineurlrequestjob.h api/qwebengineurlscheme.h api/qwebengineurlschemehandler.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.GENERATED_HEADER_FILES = QWebEngineCallback QWebEngineClientCertificateStore QWebEngineCookieStore QWebEngineFindTextResult QWebEngineHttpRequest QWebEngineNotification QWebEngineQuotaRequest QWebEngineRegisterProtocolHandlerRequest QWebEngineUrlRequestInfo QWebEngineUrlRequestInterceptor QWebEngineUrlRequestJob QWebEngineUrlScheme QWebEngineUrlSchemeHandler qtwebenginecoreversion.h QtWebEngineCoreVersion QtWebEngineCore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.PRIVATE_HEADER_FILES = api/qtwebenginecoreglobal_p.h api/qwebenginecallback_p.h api/qwebenginecookiestore_p.h api/qwebenginemessagepumpscheduler_p.h api/qwebengineurlrequestinfo_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.CLEAN_HEADER_FILES = api/qtwebenginecoreglobal.h api/qwebenginecallback.h api/qwebengineclientcertificatestore.h api/qwebenginecookiestore.h api/qwebenginefindtextresult.h api/qwebenginehttprequest.h api/qwebenginenotification.h api/qwebenginequotarequest.h api/qwebengineregisterprotocolhandlerrequest.h api/qwebengineurlrequestinfo.h api/qwebengineurlrequestinterceptor.h api/qwebengineurlrequestjob.h api/qwebengineurlscheme.h api/qwebengineurlschemehandler.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.INJECTIONS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qtwebenginecoreglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qtwebenginecoreglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qtwebenginecoreversion.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* This file was generated by syncqt. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTWEBENGINECORE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTWEBENGINECORE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTWEBENGINECORE_VERSION_STR "@@QTWEBENGINE_VERSION@@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTWEBENGINECORE_VERSION @@QTWEBENGINE_VERSION_HEX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // QT_QTWEBENGINECORE_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebenginecallback.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebenginecallback.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineclientcertificatestore.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineclientcertificatestore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebenginecookiestore.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebenginecookiestore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebenginefindtextresult.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebenginefindtextresult.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebenginehttprequest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebenginehttprequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebenginenotification.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebenginenotification.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebenginequotarequest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebenginequotarequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineregisterprotocolhandlerrequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineurlrequestinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineurlrequestinfo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineurlrequestinterceptor.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineurlrequestinterceptor.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineurlrequestjob.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineurlrequestjob.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineurlscheme.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineurlscheme.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineCore/qwebengineurlschemehandler.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/core/api/qwebengineurlschemehandler.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebenginedownloaditem_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebenginehistory_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebenginehistory_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebenginenotificationpresenter_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebenginepage_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebenginepage_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebengineprofile_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebengineprofile_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebenginescriptcollection_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/@@QTWEBENGINE_VERSION@@/QtWebEngineWidgets/private/qwebengineview_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../../../../src/webenginewidgets/api/qwebengineview_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineCertificateError
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecertificateerror.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineClientCertificateSelection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineclientcertificateselection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineContextMenuData
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecontextmenudata.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineDownloadItem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginedownloaditem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineFullScreenRequest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginefullscreenrequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineHistory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginehistory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineHistoryItem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginehistory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEnginePage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginepage.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineProfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineprofile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineScript
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginescript.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineScriptCollection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginescriptcollection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineSettings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginesettings.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QWebEngineView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineview.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QtWebEngineWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTWEBENGINEWIDGETS_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTWEBENGINEWIDGETS_MODULE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QtWebEngineWidgets/QtWebEngineWidgetsDepends>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebenginewidgetsglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecertificateerror.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineclientcertificateselection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginecontextmenudata.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginedownloaditem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginefullscreenrequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginehistory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginepage.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineprofile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginescript.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginescriptcollection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebenginesettings.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qwebengineview.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebenginewidgetsversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/QtWebEngineWidgetsVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "qtwebenginewidgetsversion.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/headers.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.HEADER_FILES = api/qtwebenginewidgetsglobal.h api/qwebenginecertificateerror.h api/qwebengineclientcertificateselection.h api/qwebenginecontextmenudata.h api/qwebenginedownloaditem.h api/qwebenginefullscreenrequest.h api/qwebenginehistory.h api/qwebenginepage.h api/qwebengineprofile.h api/qwebenginescript.h api/qwebenginescriptcollection.h api/qwebenginesettings.h api/qwebengineview.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.GENERATED_HEADER_FILES = QWebEngineCertificateError QWebEngineClientCertificateSelection QWebEngineContextMenuData QWebEngineDownloadItem QWebEngineFullScreenRequest QWebEngineHistoryItem QWebEngineHistory QWebEnginePage QWebEngineProfile QWebEngineScript QWebEngineScriptCollection QWebEngineSettings QWebEngineView qtwebenginewidgetsversion.h QtWebEngineWidgetsVersion QtWebEngineWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.PRIVATE_HEADER_FILES = api/qwebenginedownloaditem_p.h api/qwebenginehistory_p.h api/qwebenginenotificationpresenter_p.h api/qwebenginepage_p.h api/qwebengineprofile_p.h api/qwebenginescriptcollection_p.h api/qwebengineview_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.CLEAN_HEADER_FILES = api/qtwebenginewidgetsglobal.h api/qwebenginecertificateerror.h api/qwebengineclientcertificateselection.h api/qwebenginecontextmenudata.h api/qwebenginedownloaditem.h api/qwebenginefullscreenrequest.h api/qwebenginehistory.h api/qwebenginepage.h api/qwebengineprofile.h api/qwebenginescript.h api/qwebenginescriptcollection.h api/qwebenginesettings.h api/qwebengineview.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SYNCQT.INJECTIONS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qtwebenginewidgetsglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qtwebenginewidgetsglobal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qtwebenginewidgetsversion.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* This file was generated by syncqt. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_QTWEBENGINEWIDGETS_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QT_QTWEBENGINEWIDGETS_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTWEBENGINEWIDGETS_VERSION_STR "@@QTWEBENGINE_VERSION@@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define QTWEBENGINEWIDGETS_VERSION @@QTWEBENGINE_VERSION_HEX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // QT_QTWEBENGINEWIDGETS_VERSION_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginecertificateerror.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginecertificateerror.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebengineclientcertificateselection.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebengineclientcertificateselection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginecontextmenudata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginecontextmenudata.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginedownloaditem.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginedownloaditem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginefullscreenrequest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginefullscreenrequest.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginehistory.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginehistory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginepage.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginepage.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebengineprofile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebengineprofile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginescript.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginescript.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginescriptcollection.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginescriptcollection.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebenginesettings.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebenginesettings.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtWebEngineWidgets/qwebengineview.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "../../src/webenginewidgets/api/qwebengineview.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gn-devel/Portfile b/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6f3671b394..c952c623b97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ long_description GN is a meta-build system that generates build files for Nin
</span> homepage https://gn.googlesource.com/gn
subport qt5-qtwebengine-gn {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set hyphen_version 2022-04-20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hyphen_version 2022-12-09
</span> version [string map {"-" ""} ${hyphen_version}]
revision 0
description {*}${description} (for building qtwebengine)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,16 +54,16 @@ if {${subport} eq ${name}} {
</span> # Use same ref as qt5-qtwebengine to reuse distfile,
# even though bundled GN has not been updated since 5.15.10 (2082566)
# See https://github.com/qt/qtwebengine-chromium/commits/87-based/gn
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qtwebengine_chromium_ref be349eaf62e77955791d7bf29f893f1e8a37daf4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref e0fd3a5d3ce79d43dee6e0bad16a71123d9a14b3
</span> fetch.type standard
dist_subdir qt5
distname qtwebengine-chromium-${qtwebengine_chromium_ref}
master_sites https://github.com/qt/qtwebengine-chromium/archive/${qtwebengine_chromium_ref}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d1c2147e3aa333911e78c8bd4923306177716b71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f47ed8ab8cc062411f6f206da6353bc8263d6ed6d6290c689a05c01d91f646b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462213935
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d406d6f6386638fab83d98c02949f7a15b94fad4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 40280a8c77bb00888e97774e7b3ab37587eecb92633d2ed42750690a9b0b7573 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462748015
</span>
# Just extract gn; do not extract all of chromium (~2GB) or ninja
worksrcdir ${distname}/gn
</pre><pre style='margin:0'>
</pre>