PyQtWebEngine 5.15 fails to build against Qt 5.14

[Florian Bruhin]

When building PyQtWebEngine 5.15 against Qt 5.14, this happens:

   .../QtWebEngineWidgets/sipQtWebEngineWidgetsQWebEnginePage.cpp:2659:30:
   error: ‘const class QWebEnginePage’ has no member named ‘renderProcessPid’; did
   you mean ‘renderProcessTerminated’?

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 other
places with this kind of issue.

Florian

-- 
me at the-compiler.org (Mail/XMPP) | https://www.qutebrowser.org 
       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/
-------------- next part --------------
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
 };

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://www.riverbankcomputing.com/pipermail/pyqt/attachments/20200610/aede2f67/attachment-0001.sig>