diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2025-11-20 10:54:00 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2025-11-27 09:57:13 +0100 |
| commit | 95a53e2467029e917d6d421a357c13d51aaa44db (patch) | |
| tree | 6aafb348744ab0238eb0bcfbf8fc00057a01fd86 /src/plugins/android | |
| parent | ddb86461871086d3ea5f9b6d58838a2dca427a0c (diff) | |
Pass the pointer to QWebView for private counterpart
QAbstarctWebView is going to be base class of pimpl
for QWebView.
Change-Id: I58636bc5017092e1b9360d05109a305d49899043
Reviewed-by: Kaloyan Chehlarski <kaloyan.chehlarski@qt.io>
Reviewed-by: Moss Heim <moss.heim@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/qandroidwebview.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/android/qandroidwebview_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/android/qandroidwebviewplugin.cpp | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp index 4a61e5f..56e0b2a 100644 --- a/src/plugins/android/qandroidwebview.cpp +++ b/src/plugins/android/qandroidwebview.cpp @@ -76,9 +76,12 @@ void QAndroidWebViewSettingsPrivate::setAllowFileAccess(bool enabled) typedef QSet<QAndroidWebViewPrivate *> WebViews; Q_GLOBAL_STATIC(WebViews, g_webViews) -QAndroidWebViewPrivate::QAndroidWebViewPrivate(QObject *p) - : QAbstractWebView(p) , m_callbackId(0) , m_window(nullptr) - , m_viewController(nullptr) , m_webView(nullptr) +QAndroidWebViewPrivate::QAndroidWebViewPrivate(QWebView *view) + : QAbstractWebView(view), + m_callbackId(0), + m_window(nullptr), + m_viewController(nullptr), + m_webView(nullptr) { // QtAndroidWebViewController constructor blocks a qGuiThread until // the WebView is created and configured in UI thread. diff --git a/src/plugins/android/qandroidwebview_p.h b/src/plugins/android/qandroidwebview_p.h index d3d951c..4f12268 100644 --- a/src/plugins/android/qandroidwebview_p.h +++ b/src/plugins/android/qandroidwebview_p.h @@ -56,7 +56,7 @@ class QAndroidWebViewPrivate : public QAbstractWebView { Q_OBJECT public: - explicit QAndroidWebViewPrivate(QObject *p = nullptr); + explicit QAndroidWebViewPrivate(QWebView *view); ~QAndroidWebViewPrivate() override; QString httpUserAgent() const override; diff --git a/src/plugins/android/qandroidwebviewplugin.cpp b/src/plugins/android/qandroidwebviewplugin.cpp index cebd5bf..bceb553 100644 --- a/src/plugins/android/qandroidwebviewplugin.cpp +++ b/src/plugins/android/qandroidwebviewplugin.cpp @@ -13,9 +13,9 @@ class QAndroidWebViewPlugin : public QWebViewPlugin Q_PLUGIN_METADATA(IID QWebViewPluginInterface_iid FILE "android.json") public: - QAbstractWebView *create(const QString &key) const override + QAbstractWebView *create(const QString &key, QWebView *view) const override { - return (key == QLatin1String("webview")) ? new QAndroidWebViewPrivate() : nullptr; + return (key == QLatin1String("webview")) ? new QAndroidWebViewPrivate(view) : nullptr; } }; |