PyQtWebEngine 5.15 fails to build against Qt 5.14

--j7egguo5c5jlxyn6
Content-Type: multipart/mixed; boundary="wf4h3ib5golbvzr4"
Content-Disposition: inline


--wf4h3ib5golbvzr4
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

When building PyQtWebEngine 5.15 against Qt 5.14, this happens:

   .../QtWebEngineWidgets/sipQtWebEngineWidgetsQWebEnginePage.cpp:2659:30:
   error: =E2=80=98const class QWebEnginePage=E2=80=99 has no member named =
=E2=80=98renderProcessPid=E2=80=99; did
   you mean =E2=80=98renderProcessTerminated=E2=80=99?

This is because some things added to Qt 5.15 seem to be marked with
QtWebEngine_5_14_0 mistakenly. The attached patch seems to fix the build
(thanks to @deifactor on GitHub), though I didn't check if there are any ot=
her
places with this kind of issue.

Florian

--=20
[email protected] (Mail/XMPP) | https://www.qutebrowser.org=20
       https://bruhin.software/ | https://github.com/sponsors/The-Compiler/
       GPG: 916E B0C8 FD55 A072 | https://the-compiler.org/pubkey.asc
             I love long mails! | https://email.is-not-s.ms/

--wf4h3ib5golbvzr4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="514.patch"

diff --git a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip
index 5fb508f..7a4654a 100644
--- a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip
+++ b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip
@@ -48,7 +48,7 @@ public:
 %If (QtWebEngine_5_8_0 -)
         CertificateTransparencyRequired,
 %End
-%If (QtWebEngine_5_14_0 -)
+%If (QtWebEngine_5_15_0 -)
         CertificateKnownInterceptionBlocked,
 %End
     };
diff --git a/sip/QtWebEngineWidgets/qwebenginepage.sip b/sip/QtWebEngineWidgets/qwebenginepage.sip
index 0dcbed2..9aa3443 100644
--- a/sip/QtWebEngineWidgets/qwebenginepage.sip
+++ b/sip/QtWebEngineWidgets/qwebenginepage.sip
@@ -663,10 +663,10 @@ signals:
 %End

 public:
-%If (QtWebEngine_5_14_0 -)
+%If (QtWebEngine_5_15_0 -)
     qint64 renderProcessPid() const;
 %End
-%If (QtWebEngine_5_14_0 -)
+%If (QtWebEngine_5_15_0 -)
     void renderProcessPidChanged(qint64 pid);
 %End
 };


--wf4h3ib5golbvzr4--

--j7egguo5c5jlxyn6
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE4E5WAAJAG47w528KkW6wyP1VoHIFAl7hNEYACgkQkW6wyP1V
oHJjjQ/+KVzeF1NN9n8LKyNHNQrXTWu0zGLBGJ81kXpDUs8lre2V/2Vtb6oXwWFv
IE7Y9eRkSlxjT+2GCTWjD/m7DEAhgmfaYb0wYxLvjI8GJzUqYheOC10qhM7Zcakn
A+Rcu9wGQM99J37+QvsAw0JTZ4zFCOL9DOWxI0KXhqprP3+4w15MBLQplCXjUYbm
SwnIyL3d4AXwy3BYEo0jFOvapwx/vvdW58r5u5XsIRW1eLZF8Bmn2ciu9zrvwxDu
ARRBe7b3h5PCf2OFS9J4yOpZSyg499bM9xWL1bvl8+JgF82+VyoBzlaTvTCLf5xD
uSjg72KuGRjrtZU9+2t/gE+rmjFlLme7pduyIHkir+hbyugdPo99/YDKb44k/Rf5
sP+Azm8krkyfTuJpvBVu2GljeOUvoGR/CSEQMbemy++kMTaMX+ZstFydt/IInrpf
iEnazGblZ0Rl1CeK1we1/vOA7iFRb5/sDexRh6PRkBKOpRfzneSlcE44IrzgW5PQ
SFJMsjukCj/0GIqKv5kbi5GMobzOzcBSu2cIMQFa9e2H4c5yBCooNSt3i9eg2yM5
lGOL4hxddHHfIRu5LfZZhKL1dT+/N2GcOJlKvvJcAWKVVBHPxTpu0gEo2gtEJS1E
4PfNYZg1+ywfbfuj+RxhY0M+PIV7jv4evi3HhsRg5DjLpjnOAEY=
=V7y4
-----END PGP SIGNATURE-----

--j7egguo5c5jlxyn6--