[neon/forks/pyqt5webengine/Neon/release] /: New upstream version 5.15.5

Dmitry Shachnev null at kde.org
Fri Oct 14 15:54:08 BST 2022


Git commit c87b9df599e20b4adc1212895f88d9ec327523e7 by Dmitry Shachnev.
Committed on 23/10/2021 at 11:40.
Pushed by jriddell into branch 'Neon/release'.

New upstream version 5.15.5

M  +20   -0    ChangeLog
M  +1    -3    PKG-INFO
M  +0    -2    README
M  +1    -1    configure.py
M  +1    -1    pyproject.toml
M  +2    -0    sip/QtWebEngine/qquickwebengineprofile.sip
M  +2    -2    sip/QtWebEngine/qtwebengineglobal.sip
M  +0    -10   sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
M  +0    -10   sip/QtWebEngineCore/qwebenginequotarequest.sip
M  +0    -10   sip/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip

https://invent.kde.org/neon/forks/pyqt5webengine/commit/c87b9df599e20b4adc1212895f88d9ec327523e7

diff --git a/ChangeLog b/ChangeLog
index bbedbba..ce4a75b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
+2021-08-10  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* README:
+	Fixed the README.
+	[69a1dc1f1cf1] [5.15.5] <5.15-maint>
+
+2021-04-05  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* PyQtWebEngine.msp:
+	Only enable QWebEngineClientCertificateStore when SSL is enabled.
+	[9e311bed7a8f] <5.15-maint>
+
+	* PyQtWebEngine.msp:
+	Removed the internal QtWebEngineCore namespace.
+	[bdf97a8aacfa] <5.15-maint>
+
 2021-03-04  Phil Thompson  <phil at riverbankcomputing.com>
 
+	* .hgtags:
+	Added tag 5.15.4 for changeset 2b38e9f975ce
+	[79bb44a7ba04] <5.15-maint>
+
 	* NEWS:
 	Released as v5.15.4.
 	[2b38e9f975ce] [5.15.4] <5.15-maint>
diff --git a/PKG-INFO b/PKG-INFO
index ff8f434..a875c05 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQtWebEngine
-Version: 5.15.4
+Version: 5.15.5
 Requires-Python: >=3.6
 Summary: Python bindings for the Qt WebEngine framework
 Home-Page: https://www.riverbankcomputing.com/software/pyqtwebengine/
@@ -49,8 +49,6 @@ The GPL version of PyQtWebEngine can be installed from PyPI::
 
     pip install PyQtWebEngine
 
-The wheels include a copy of the required parts of the LGPL version of Qt.
-
 ``pip`` will also build and install the bindings from the sdist package but
 Qt's ``qmake`` tool must be on ``PATH``.
 
diff --git a/README b/README
index 933cb7d..7f259ba 100644
--- a/README
+++ b/README
@@ -38,8 +38,6 @@ The GPL version of PyQtWebEngine can be installed from PyPI::
 
     pip install PyQtWebEngine
 
-The wheels include a copy of the required parts of the LGPL version of Qt.
-
 ``pip`` will also build and install the bindings from the sdist package but
 Qt's ``qmake`` tool must be on ``PATH``.
 
diff --git a/configure.py b/configure.py
index 240c64c..e2e586a 100644
--- a/configure.py
+++ b/configure.py
@@ -238,7 +238,7 @@ class PackageConfiguration(object):
 
     # The version of the module as a string.  Set it to None if you don't
     # provide version information.
-    version = '5.15.4'
+    version = '5.15.5'
 
     # The name of the PEP 376 .dist-info directory to be created.
     distinfo_name = 'PyQtWebEngine'
diff --git a/pyproject.toml b/pyproject.toml
index cc72a3b..fa3fdfc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "sipbuild.api"
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]
 name = "PyQtWebEngine"
-version = "5.15.4"
+version = "5.15.5"
 summary = "Python bindings for the Qt WebEngine framework"
 home-page = "https://www.riverbankcomputing.com/software/pyqtwebengine/"
 author = "Riverbank Computing Limited"
diff --git a/sip/QtWebEngine/qquickwebengineprofile.sip b/sip/QtWebEngine/qquickwebengineprofile.sip
index f1527b1..56b2ba8 100644
--- a/sip/QtWebEngine/qquickwebengineprofile.sip
+++ b/sip/QtWebEngine/qquickwebengineprofile.sip
@@ -161,8 +161,10 @@ public:
     void setDownloadPath(const QString &path);
 %End
 %If (QtWebEngine_5_13_0 -)
+%If (PyQt_SSL)
     QWebEngineClientCertificateStore *clientCertificateStore();
 %End
+%End
 
 signals:
 %If (QtWebEngine_5_13_0 -)
diff --git a/sip/QtWebEngine/qtwebengineglobal.sip b/sip/QtWebEngine/qtwebengineglobal.sip
index c5f3093..c3da9df 100644
--- a/sip/QtWebEngine/qtwebengineglobal.sip
+++ b/sip/QtWebEngine/qtwebengineglobal.sip
@@ -25,8 +25,8 @@ int PYQT_WEBENGINE_VERSION;
 const char *PYQT_WEBENGINE_VERSION_STR;
 
 %ModuleCode
-static int PYQT_WEBENGINE_VERSION = 0x050f04;
-static const char *PYQT_WEBENGINE_VERSION_STR = "5.15.4";
+static int PYQT_WEBENGINE_VERSION = 0x050f05;
+static const char *PYQT_WEBENGINE_VERSION_STR = "5.15.5";
 %End
 %If (QtWebEngine_5_6_0 -)
 
diff --git a/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip b/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
index be0359f..02f03e8 100644
--- a/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
+++ b/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
@@ -20,16 +20,6 @@
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 
-%If (QtWebEngine_5_13_0 -)
-
-namespace QtWebEngineCore
-{
-%TypeHeaderCode
-#include <qwebengineclientcertificatestore.h>
-%End
-};
-
-%End
 %If (QtWebEngine_5_13_0 -)
 %If (PyQt_SSL)
 
diff --git a/sip/QtWebEngineCore/qwebenginequotarequest.sip b/sip/QtWebEngineCore/qwebenginequotarequest.sip
index 6564c51..533ade3 100644
--- a/sip/QtWebEngineCore/qwebenginequotarequest.sip
+++ b/sip/QtWebEngineCore/qwebenginequotarequest.sip
@@ -22,16 +22,6 @@
 
 %If (QtWebEngine_5_11_0 -)
 
-namespace QtWebEngineCore
-{
-%TypeHeaderCode
-#include <qwebenginequotarequest.h>
-%End
-};
-
-%End
-%If (QtWebEngine_5_11_0 -)
-
 class QWebEngineQuotaRequest
 {
 %TypeHeaderCode
diff --git a/sip/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip b/sip/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
index 9950d42..0b7a0d0 100644
--- a/sip/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
+++ b/sip/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
@@ -22,16 +22,6 @@
 
 %If (QtWebEngine_5_11_0 -)
 
-namespace QtWebEngineCore
-{
-%TypeHeaderCode
-#include <qwebengineregisterprotocolhandlerrequest.h>
-%End
-};
-
-%End
-%If (QtWebEngine_5_11_0 -)
-
 class QWebEngineRegisterProtocolHandlerRequest
 {
 %TypeHeaderCode



More information about the Neon-commits mailing list