diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2025-11-26 10:41:08 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2025-12-01 16:03:27 +0100 |
| commit | c20421d02e70346dd105d44612aaf90c33b29096 (patch) | |
| tree | 9611283c2509baefee34a3127f9606b0b3ace46b | |
| parent | 6a0334f016efb7b2455008d0889fdc5b8db4503f (diff) | |
Clean up and rename qabstractwebview_p.h to qwebview_p.h
Prepare for proper private class for QWebView.
Task-number: QTBUG-131837
Change-Id: I7303055370ff946cbc7be94ea54a4c57a57021ca
Reviewed-by: Moss Heim <moss.heim@qt.io>
| -rw-r--r-- | src/plugins/android/qandroidwebview_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/darwin/qdarwinwebview_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/wasm/qwasmwebview_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/webengine/qwebenginewebview_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/windows/qwebview2webview_p.h | 2 | ||||
| -rw-r--r-- | src/quick/qquickwebview.cpp | 2 | ||||
| -rw-r--r-- | src/webview/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/webview/qwebview_p.h (renamed from src/webview/qabstractwebview_p.h) | 2 | ||||
| -rw-r--r-- | src/webview/qwebviewfactory_p.h | 2 | ||||
| -rw-r--r-- | src/webview/qwebviewplugin_p.h | 2 | ||||
| -rw-r--r-- | src/webview/qwebviewsettings.cpp | 2 |
11 files changed, 11 insertions, 12 deletions
diff --git a/src/plugins/android/qandroidwebview_p.h b/src/plugins/android/qandroidwebview_p.h index 10c79ce..dbb6e6e 100644 --- a/src/plugins/android/qandroidwebview_p.h +++ b/src/plugins/android/qandroidwebview_p.h @@ -22,7 +22,7 @@ #include <QtCore/qjniobject.h> #include <QtCore/qjnitypes.h> -#include <private/qabstractwebview_p.h> +#include <private/qwebview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/darwin/qdarwinwebview_p.h b/src/plugins/darwin/qdarwinwebview_p.h index b69791a..e6f6ce0 100644 --- a/src/plugins/darwin/qdarwinwebview_p.h +++ b/src/plugins/darwin/qdarwinwebview_p.h @@ -20,7 +20,7 @@ #include <QtCore/qurl.h> #include <QtGui/qwindow.h> -#include <private/qabstractwebview_p.h> +#include <private/qwebview_p.h> #include <QtCore/qpointer.h> diff --git a/src/plugins/wasm/qwasmwebview_p.h b/src/plugins/wasm/qwasmwebview_p.h index 3fdb102..ae0f1f0 100644 --- a/src/plugins/wasm/qwasmwebview_p.h +++ b/src/plugins/wasm/qwasmwebview_p.h @@ -24,7 +24,7 @@ #include <QtGui/qpa/qplatformwindow_p.h> #include <emscripten/val.h> -#include <private/qabstractwebview_p.h> +#include <private/qwebview_p.h> #include <optional> diff --git a/src/plugins/webengine/qwebenginewebview_p.h b/src/plugins/webengine/qwebenginewebview_p.h index 213ca2a..6a7f0ce 100644 --- a/src/plugins/webengine/qwebenginewebview_p.h +++ b/src/plugins/webengine/qwebenginewebview_p.h @@ -22,7 +22,7 @@ #include <QtQml/qqmlcomponent.h> -#include <private/qabstractwebview_p.h> +#include <private/qwebview_p.h> #include <QtWebEngineQuick/QQuickWebEngineProfile> #include <QtWebEngineQuick/private/qquickwebenginesettings_p.h> diff --git a/src/plugins/windows/qwebview2webview_p.h b/src/plugins/windows/qwebview2webview_p.h index ad2ff4c..c7c0266 100644 --- a/src/plugins/windows/qwebview2webview_p.h +++ b/src/plugins/windows/qwebview2webview_p.h @@ -5,7 +5,7 @@ #ifndef QWEBVIEW2WEBVIEW_P_H #define QWEBVIEW2WEBVIEW_P_H -#include <private/qabstractwebview_p.h> +#include <private/qwebview_p.h> #include <QMap> #include <QPointer> diff --git a/src/quick/qquickwebview.cpp b/src/quick/qquickwebview.cpp index 26d8328..2d67df6 100644 --- a/src/quick/qquickwebview.cpp +++ b/src/quick/qquickwebview.cpp @@ -6,7 +6,7 @@ #include "qquickwebviewloadrequest_p.h" #include "qquickwebviewsettings_p.h" #include <QtWebView/qwebviewloadrequest.h> -#include <QtWebView/private/qabstractwebview_p.h> +#include <QtWebView/private/qwebview_p.h> #include <QtQml/qqmlengine.h> #include <QtCore/qmutex.h> diff --git a/src/webview/CMakeLists.txt b/src/webview/CMakeLists.txt index e74df4f..3354996 100644 --- a/src/webview/CMakeLists.txt +++ b/src/webview/CMakeLists.txt @@ -10,9 +10,8 @@ qt_internal_add_module(WebView DEPENDENCIES QtQuick/auto SOURCES - qabstractwebview_p.h qtwebviewfunctions.cpp qtwebviewfunctions.h - qwebview.cpp qwebview.h + qwebview.cpp qwebview.h qwebview_p.h qwebview_global.h qwebviewfactory.cpp qwebviewfactory_p.h qwebviewloadrequest.cpp qwebviewloadrequest.h diff --git a/src/webview/qabstractwebview_p.h b/src/webview/qwebview_p.h index 87d58e8..f9ad661 100644 --- a/src/webview/qabstractwebview_p.h +++ b/src/webview/qwebview_p.h @@ -43,7 +43,7 @@ public: virtual void setAllowFileAccess(bool) = 0; protected: - explicit QAbstractWebViewSettings(QObject *p = nullptr) : QObject(p) {} + explicit QAbstractWebViewSettings(QObject *p = nullptr) : QObject(p) { } }; class Q_WEBVIEW_EXPORT QAbstractWebView : public QObject diff --git a/src/webview/qwebviewfactory_p.h b/src/webview/qwebviewfactory_p.h index 01f2610..99848fc 100644 --- a/src/webview/qwebviewfactory_p.h +++ b/src/webview/qwebviewfactory_p.h @@ -16,7 +16,7 @@ // We mean it. // -#include "qabstractwebview_p.h" +#include "qwebview_p.h" QT_BEGIN_NAMESPACE diff --git a/src/webview/qwebviewplugin_p.h b/src/webview/qwebviewplugin_p.h index a98f810..abb09c1 100644 --- a/src/webview/qwebviewplugin_p.h +++ b/src/webview/qwebviewplugin_p.h @@ -17,7 +17,7 @@ // #include "qwebview_global.h" -#include "qabstractwebview_p.h" +#include "qwebview_p.h" #include <QtCore/qobject.h> diff --git a/src/webview/qwebviewsettings.cpp b/src/webview/qwebviewsettings.cpp index 894e9f5..f9c8893 100644 --- a/src/webview/qwebviewsettings.cpp +++ b/src/webview/qwebviewsettings.cpp @@ -3,7 +3,7 @@ // Qt-Security score:significant reason:default #include "qwebviewsettings.h" -#include "qabstractwebview_p.h" +#include "qwebview_p.h" QT_BEGIN_NAMESPACE |