Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-webview for openSUSE:Factory checked in at 2022-11-21 15:29:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-webview (Old) and /work/SRC/openSUSE:Factory/.qt6-webview.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-webview" Mon Nov 21 15:29:23 2022 rev:4 rq:1036933 version:6.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-webview/qt6-webview.changes 2022-10-01 17:44:08.545777713 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-webview.new.1597/qt6-webview.changes 2022-11-21 15:29:38.628662985 +0100 @@ -1,0 +2,6 @@ +Tue Nov 15 11:53:29 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.4.1: + * https://www.qt.io/blog/qt-6.4.1-released + +------------------------------------------------------------------- Old: ---- qtwebview-everywhere-src-6.4.0.tar.xz New: ---- qtwebview-everywhere-src-6.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-webview.spec ++++++ --- /var/tmp/diff_new_pack.cSkh7p/_old 2022-11-21 15:29:39.064665198 +0100 +++ /var/tmp/diff_new_pack.cSkh7p/_new 2022-11-21 15:29:39.068665218 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.0 +%define real_version 6.4.1 %define short_version 6.4 %define tar_name qtwebview-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-webview%{?pkg_suffix} -Version: 6.4.0 +Version: 6.4.1 Release: 0 Summary: Qt 6 WebView library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtwebview-everywhere-src-6.4.0.tar.xz -> qtwebview-everywhere-src-6.4.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/.cmake.conf new/qtwebview-everywhere-src-6.4.1/.cmake.conf --- old/qtwebview-everywhere-src-6.4.0/.cmake.conf 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/.cmake.conf 2022-11-09 09:41:53.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.4.0") +set(QT_REPO_MODULE_VERSION "6.4.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/.tag new/qtwebview-everywhere-src-6.4.1/.tag --- old/qtwebview-everywhere-src-6.4.0/.tag 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/.tag 2022-11-09 09:41:53.000000000 +0100 @@ -1 +1 @@ -200d1b999f586e0fbb532bb78b898665e771b55e +51d9fb1706554a8ed93226d9679738bbc28fe080 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/dependencies.yaml new/qtwebview-everywhere-src-6.4.1/dependencies.yaml --- old/qtwebview-everywhere-src-6.4.0/dependencies.yaml 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/dependencies.yaml 2022-11-09 09:41:53.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtdeclarative: - ref: 0c0f33b73e3259dbf35481d3f1ffb81a97b76190 + ref: a514640b2a38391fceaaac3ca01b390ad3d62f31 required: true ../qtwebengine: - ref: e401e26fb5db72cc79af56bea942409c1d044bf4 + ref: 4a3d409987e4a2dcdcae80310cd478e2b841a1e3 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qabstractwebview_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qabstractwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qabstractwebview_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qabstractwebview_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qabstractwebview_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qnativeviewcontroller_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qnativeviewcontroller_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qnativeviewcontroller_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qnativeviewcontroller_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qnativeviewcontroller_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebview_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebview_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebview_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qwebview_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewfactory_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewfactory_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewfactory_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewfactory_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qwebviewfactory_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewinterface_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewinterface_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewinterface_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewinterface_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qwebviewinterface_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewloadrequest_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewloadrequest_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewloadrequest_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewloadrequest_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qwebviewloadrequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewplugin_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewplugin_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.0/QtWebView/private/qwebviewplugin_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.0/QtWebView/private/qwebviewplugin_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/webview/qwebviewplugin_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qabstractwebview_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qabstractwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qabstractwebview_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qabstractwebview_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qabstractwebview_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qnativeviewcontroller_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qnativeviewcontroller_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qnativeviewcontroller_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qnativeviewcontroller_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qnativeviewcontroller_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebview_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebview_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebview_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qwebview_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewfactory_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewfactory_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewfactory_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewfactory_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qwebviewfactory_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewinterface_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewinterface_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewinterface_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewinterface_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qwebviewinterface_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewloadrequest_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewloadrequest_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewloadrequest_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewloadrequest_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qwebviewloadrequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewplugin_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewplugin_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/6.4.1/QtWebView/private/qwebviewplugin_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/6.4.1/QtWebView/private/qwebviewplugin_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/webview/qwebviewplugin_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebView/qtwebviewversion.h new/qtwebview-everywhere-src-6.4.1/include/QtWebView/qtwebviewversion.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebView/qtwebviewversion.h 2022-09-27 08:05:37.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebView/qtwebviewversion.h 2022-11-10 12:06:02.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBVIEW_VERSION_H #define QT_QTWEBVIEW_VERSION_H -#define QTWEBVIEW_VERSION_STR "6.4.0" +#define QTWEBVIEW_VERSION_STR "6.4.1" -#define QTWEBVIEW_VERSION 0x060400 +#define QTWEBVIEW_VERSION 0x060401 #endif // QT_QTWEBVIEW_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickviewcontroller_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickviewcontroller_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickviewcontroller_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickviewcontroller_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick/qquickviewcontroller_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebview_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebview_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebview_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick/qquickwebview_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebviewloadrequest_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebviewloadrequest_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebviewloadrequest_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qquickwebviewloadrequest_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick/qquickwebviewloadrequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qtwebviewquickglobal_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qtwebviewquickglobal_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qtwebviewquickglobal_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.0/QtWebViewQuick/private/qtwebviewquickglobal_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick/qtwebviewquickglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickviewcontroller_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickviewcontroller_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickviewcontroller_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickviewcontroller_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick/qquickviewcontroller_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebview_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebview_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebview_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick/qquickwebview_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebviewloadrequest_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebviewloadrequest_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebviewloadrequest_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qquickwebviewloadrequest_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick/qquickwebviewloadrequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qtwebviewquickglobal_p.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qtwebviewquickglobal_p.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qtwebviewquickglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/6.4.1/QtWebViewQuick/private/qtwebviewquickglobal_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick/qtwebviewquickglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/qtwebviewquickversion.h new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/qtwebviewquickversion.h --- old/qtwebview-everywhere-src-6.4.0/include/QtWebViewQuick/qtwebviewquickversion.h 2022-09-27 08:05:37.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/include/QtWebViewQuick/qtwebviewquickversion.h 2022-11-10 12:06:02.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBVIEWQUICK_VERSION_H #define QT_QTWEBVIEWQUICK_VERSION_H -#define QTWEBVIEWQUICK_VERSION_STR "6.4.0" +#define QTWEBVIEWQUICK_VERSION_STR "6.4.1" -#define QTWEBVIEWQUICK_VERSION 0x060400 +#define QTWEBVIEWQUICK_VERSION 0x060401 #endif // QT_QTWEBVIEWQUICK_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/plugins/darwin/CMakeLists.txt new/qtwebview-everywhere-src-6.4.1/src/plugins/darwin/CMakeLists.txt --- old/qtwebview-everywhere-src-6.4.0/src/plugins/darwin/CMakeLists.txt 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/plugins/darwin/CMakeLists.txt 2022-11-09 09:41:53.000000000 +0100 @@ -18,6 +18,7 @@ ${FWWebKit} Qt::Core Qt::Gui + Qt::Quick Qt::WebViewPrivate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/plugins/darwin/qdarwinwebview.mm new/qtwebview-everywhere-src-6.4.1/src/plugins/darwin/qdarwinwebview.mm --- old/qtwebview-everywhere-src-6.4.0/src/plugins/darwin/qdarwinwebview.mm 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/plugins/darwin/qdarwinwebview.mm 2022-11-09 09:41:53.000000000 +0100 @@ -11,6 +11,9 @@ #include <QtCore/qmap.h> #include <QtCore/qvariant.h> +#include <QtQuick/qquickrendercontrol.h> +#include <QtQuick/qquickwindow.h> + #include <CoreFoundation/CoreFoundation.h> #include <WebKit/WebKit.h> @@ -326,8 +329,11 @@ if (!wkWebView) return; + // NOTE: We delay adding the uiView to the scene + // if the window is not backed by a platform window + // see: updateParent(). QWindow *w = qobject_cast<QWindow *>(view); - if (w) { + if (w && w->handle()) { UIView *parentView = reinterpret_cast<UIView *>(w->winId()); [parentView addSubview:wkWebView]; } else { @@ -363,6 +369,26 @@ Q_EMIT requestFocus(focus); } +void QDarwinWebViewPrivate::updatePolish() +{ + // This is a special case for when the WebView is inside a QQuickWidget... + // We delay adding the view until we can verify that we have a non-hidden platform window. + if (m_parentView && wkWebView.superview == nullptr) { + if (auto window = qobject_cast<QWindow *>(m_parentView)) { + if (window->visibility() != QWindow::Hidden) { + UIView *parentView = nullptr; + if (window->handle()) + parentView = reinterpret_cast<UIView *>(window->winId()); + else if (auto rw = QQuickRenderControl::renderWindowFor(qobject_cast<QQuickWindow *>(window))) + parentView = reinterpret_cast<UIView *>(rw->winId()); + + if (parentView) + [parentView addSubview:wkWebView]; + } + } + } +} + void QDarwinWebViewPrivate::goBack() { [wkWebView goBack]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/plugins/darwin/qdarwinwebview_p.h new/qtwebview-everywhere-src-6.4.1/src/plugins/darwin/qdarwinwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/src/plugins/darwin/qdarwinwebview_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/plugins/darwin/qdarwinwebview_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -65,6 +65,7 @@ void setVisibility(QWindow::Visibility visibility) override; void setVisible(bool visible) override; void setFocus(bool focus) override; + void updatePolish() override; public Q_SLOTS: void goBack() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/quick/qquickviewcontroller.cpp new/qtwebview-everywhere-src-6.4.1/src/quick/qquickviewcontroller.cpp --- old/qtwebview-everywhere-src-6.4.0/src/quick/qquickviewcontroller.cpp 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/quick/qquickviewcontroller.cpp 2022-11-09 09:41:53.000000000 +0100 @@ -176,6 +176,7 @@ m_view->setGeometry(rw ? QRect(rw->mapFromGlobal(tl), itemSize) : itemGeometry); m_view->setVisible(isVisible()); + m_view->updatePolish(); } void QQuickViewController::setView(QNativeViewController *view) @@ -221,6 +222,7 @@ &QQuickViewController::scheduleUpdatePolish); connect(window, &QQuickWindow::sceneGraphInvalidated, this, &QQuickViewController::onSceneGraphInvalidated); + connect(rw, &QWindow::visibilityChanged, this, &QQuickViewController::scheduleUpdatePolish); m_view->setParentView(rw); } else { connect(window, &QWindow::widthChanged, this, &QQuickViewController::scheduleUpdatePolish); @@ -234,6 +236,7 @@ connect(window, &QWindow::visibilityChanged, this, [this](QWindow::Visibility visibility) { m_view->setVisible(visibility != QWindow::Hidden); }); + connect(window, &QWindow::visibilityChanged, this, &QQuickViewController::scheduleUpdatePolish); m_view->setVisible(window->visibility() != QWindow::Hidden); m_view->setParentView(window); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/webview/qnativeviewcontroller_p.h new/qtwebview-everywhere-src-6.4.1/src/webview/qnativeviewcontroller_p.h --- old/qtwebview-everywhere-src-6.4.0/src/webview/qnativeviewcontroller_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/webview/qnativeviewcontroller_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -34,6 +34,7 @@ virtual void setVisible(bool visible) = 0; virtual void init() { } virtual void setFocus(bool focus) { Q_UNUSED(focus); } + virtual void updatePolish() { } }; QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/webview/qwebview.cpp new/qtwebview-everywhere-src-6.4.1/src/webview/qwebview.cpp --- old/qtwebview-everywhere-src-6.4.0/src/webview/qwebview.cpp 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/webview/qwebview.cpp 2022-11-09 09:41:53.000000000 +0100 @@ -131,6 +131,11 @@ d->setFocus(focus); } +void QWebView::updatePolish() +{ + d->updatePolish(); +} + void QWebView::loadHtml(const QString &html, const QUrl &baseUrl) { d->loadHtml(html, baseUrl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/src/webview/qwebview_p.h new/qtwebview-everywhere-src-6.4.1/src/webview/qwebview_p.h --- old/qtwebview-everywhere-src-6.4.0/src/webview/qwebview_p.h 2022-09-27 05:37:12.000000000 +0200 +++ new/qtwebview-everywhere-src-6.4.1/src/webview/qwebview_p.h 2022-11-09 09:41:53.000000000 +0100 @@ -60,6 +60,7 @@ void setVisibility(QWindow::Visibility visibility) override; void setVisible(bool visible) override; void setFocus(bool focus) override; + void updatePolish() override; public Q_SLOTS: void goBack() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/manual/CMakeLists.txt new/qtwebview-everywhere-src-6.4.1/tests/manual/CMakeLists.txt --- old/qtwebview-everywhere-src-6.4.0/tests/manual/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/manual/CMakeLists.txt 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,4 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +add_subdirectory(inquickwidget) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/CMakeLists.txt new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/CMakeLists.txt --- old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/CMakeLists.txt 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,28 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +find_package(Qt6 COMPONENTS Widgets QuickWidgets) + +qt_internal_add_manual_test(manual_tst_inquickwidget + GUI + SOURCES + main.cpp + LIBRARIES + Qt::Gui + Qt::Quick + Qt::Widgets + Qt::QuickWidgets + Qt::WebView +) + +# Resources: +set(qml_resource_files + "main.qml" +) + +qt_internal_add_resource(manual_tst_inquickwidget "qml" + PREFIX + "/" + FILES + ${qml_resource_files} +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/inquickwidget.pro new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/inquickwidget.pro --- old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/inquickwidget.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/inquickwidget.pro 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,10 @@ +QT += core gui webview quickwidgets + +SOURCES += \ + main.cpp + +RESOURCES += \ + qml.qrc + +DISTFILES += \ + main.qml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/main.cpp new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/main.cpp --- old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/main.cpp 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,21 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include <QtWidgets/qapplication.h> +#include <QtWidgets/QHBoxLayout> +#include <QtQuickWidgets/qquickwidget.h> + +int main(int argc, char *argv[]) +{ + QQuickWindow::setGraphicsApi(QSGRendererInterface::GraphicsApi::OpenGL); + QApplication a(argc, argv); + QWidget w; + w.setGeometry(0, 0, 800, 600); + w.setLayout(new QHBoxLayout); + QQuickWidget *qw = new QQuickWidget; + qw->setResizeMode(QQuickWidget::ResizeMode::SizeRootObjectToView); + qw->setSource(QUrl(QStringLiteral("qrc:/main.qml"))); + w.layout()->addWidget(qw); + w.show(); + return a.exec(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/main.qml new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/main.qml --- old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/main.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/main.qml 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,15 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick 2.0 +import QtWebView 1.1 + +Rectangle { + anchors.fill: parent + color: "green" + + WebView { + anchors.fill: parent + url: "https://qt.io"; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/qml.qrc new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/qml.qrc --- old/qtwebview-everywhere-src-6.4.0/tests/manual/inquickwidget/qml.qrc 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/manual/inquickwidget/qml.qrc 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + </qresource> +</RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebview-everywhere-src-6.4.0/tests/tests.pro new/qtwebview-everywhere-src-6.4.1/tests/tests.pro --- old/qtwebview-everywhere-src-6.4.0/tests/tests.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebview-everywhere-src-6.4.1/tests/tests.pro 2022-11-09 09:41:53.000000000 +0100 @@ -0,0 +1,10 @@ +TEMPLATE = subdirs + +# Currently the tests are adapted for the platforms +# that provide a native WebView implementation. +android|ios|winrt { + SUBDIRS += auto +} + +SUBDIRS += \ + manual/inquickwidget
