diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2024-04-25 10:14:54 +0200 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2024-04-25 16:39:05 +0200 |
commit | df6f68cb7af51c2141f7b263ed89a3e9a3f46379 (patch) | |
tree | f4fda70aa355f96e6c87df0eee8e6d77340ba36f | |
parent | b46f923e69454fa79d22a5c1c731baf0999e393c (diff) |
Add the missing _p suffix to the private header files in WebEngineQuick/Widgets
Pick-to: 6.5 6.6 6.7
Change-Id: I4b64147cb70c3994ed054374c9047fe9274da777
Reviewed-by: Moss Heim <moss.heim@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
13 files changed, 57 insertions, 13 deletions
diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt index 5f8344f08..b7de1c2af 100644 --- a/src/webenginequick/CMakeLists.txt +++ b/src/webenginequick/CMakeLists.txt @@ -37,8 +37,8 @@ qt_internal_add_qml_module(WebEngineQuick api/qquickwebengineforeigntypes_p.h api/qtwebenginequickglobal.cpp api/qtwebenginequickglobal.h api/qtwebenginequickglobal_p.h - render_widget_host_view_qt_delegate_quickwindow.cpp render_widget_host_view_qt_delegate_quickwindow.h - ui_delegates_manager.cpp ui_delegates_manager.h + render_widget_host_view_qt_delegate_quickwindow.cpp render_widget_host_view_qt_delegate_quickwindow_p.h + ui_delegates_manager.cpp ui_delegates_manager_p.h DEFINES QT_BUILD_WEBENGINE_LIB INCLUDE_DIRECTORIES @@ -65,7 +65,7 @@ qt_internal_extend_target(WebEngineQuick CONDITION QT_FEATURE_webengine_webchann qt_internal_extend_target(WebEngineQuick CONDITION QT_FEATURE_accessibility SOURCES - qquickwebengine_accessible.cpp qquickwebengine_accessible.h + qquickwebengine_accessible.cpp qquickwebengine_accessible_p.h ) qt_internal_extend_target(qtwebenginequickplugin diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 31e5d572e..78248346b 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -25,9 +25,9 @@ #include "find_text_helper.h" #include "javascript_dialog_controller.h" #include "render_widget_host_view_qt_delegate_item.h" -#include "render_widget_host_view_qt_delegate_quickwindow.h" +#include "render_widget_host_view_qt_delegate_quickwindow_p.h" #include "touch_selection_menu_controller.h" -#include "ui_delegates_manager.h" +#include "ui_delegates_manager_p.h" #include "web_contents_adapter.h" #include <QtWebEngineCore/qwebenginecertificateerror.h> @@ -63,7 +63,7 @@ #include <QtQml/qqmlproperty.h> #if QT_CONFIG(accessibility) -#include "qquickwebengine_accessible.h" +#include "qquickwebengine_accessible_p.h" #include <QtGui/qaccessible.h> #endif diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h index ee7da99b9..66e53bdd0 100644 --- a/src/webenginequick/api/qquickwebengineview_p_p.h +++ b/src/webenginequick/api/qquickwebengineview_p_p.h @@ -19,7 +19,7 @@ #include "qquickwebengineview_p.h" #include "render_view_context_menu_qt.h" #include "touch_handle_drawable_client.h" -#include "ui_delegates_manager.h" +#include "ui_delegates_manager_p.h" #include "web_contents_adapter_client.h" #include <QtCore/qcompilerdetection.h> diff --git a/src/webenginequick/qquickwebengine_accessible.cpp b/src/webenginequick/qquickwebengine_accessible.cpp index 2941f01b5..e156a5e8b 100644 --- a/src/webenginequick/qquickwebengine_accessible.cpp +++ b/src/webenginequick/qquickwebengine_accessible.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "qquickwebengine_accessible.h" +#include "qquickwebengine_accessible_p.h" #include <QQuickItem> #include <QQuickWindow> diff --git a/src/webenginequick/qquickwebengine_accessible.h b/src/webenginequick/qquickwebengine_accessible_p.h index 479de9789..2f774f898 100644 --- a/src/webenginequick/qquickwebengine_accessible.h +++ b/src/webenginequick/qquickwebengine_accessible_p.h @@ -4,6 +4,17 @@ #ifndef QQUICKWEBENGINE_ACCESSIBLE_H #define QQUICKWEBENGINE_ACCESSIBLE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/qpointer.h> #include <QtGui/qaccessibleobject.h> diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp index b003dabe4..090b09281 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "render_widget_host_view_qt_delegate_quickwindow.h" +#include "render_widget_host_view_qt_delegate_quickwindow_p.h" #include "api/qquickwebengineview_p_p.h" diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow_p.h index 712eef732..3559bd2f0 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow_p.h @@ -4,6 +4,17 @@ #ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICKWINDOW_H #define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICKWINDOW_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "render_widget_host_view_qt_delegate.h" #include "render_widget_host_view_qt_delegate_item.h" diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp index 3d6eff649..a4a22fedd 100644 --- a/src/webenginequick/ui_delegates_manager.cpp +++ b/src/webenginequick/ui_delegates_manager.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "ui_delegates_manager.h" +#include "ui_delegates_manager_p.h" #include "api/qquickwebengineaction_p.h" #include "api/qquickwebengineview_p_p.h" diff --git a/src/webenginequick/ui_delegates_manager.h b/src/webenginequick/ui_delegates_manager_p.h index 24dde656c..3502757d7 100644 --- a/src/webenginequick/ui_delegates_manager.h +++ b/src/webenginequick/ui_delegates_manager_p.h @@ -4,6 +4,17 @@ #ifndef UI_DELEGATES_MANAGER_H #define UI_DELEGATES_MANAGER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/qcoreapplication.h> // Q_DECLARE_TR_FUNCTIONS #include <QtCore/qobject.h> #include <QtCore/qpoint.h> diff --git a/src/webenginewidgets/CMakeLists.txt b/src/webenginewidgets/CMakeLists.txt index dd11e48be..ff043b45a 100644 --- a/src/webenginewidgets/CMakeLists.txt +++ b/src/webenginewidgets/CMakeLists.txt @@ -37,7 +37,7 @@ qt_internal_add_module(WebEngineWidgets qt_internal_extend_target(WebEngineWidgets CONDITION QT_FEATURE_accessibility SOURCES - qwebengine_accessible.cpp qwebengine_accessible.h + qwebengine_accessible.cpp qwebengine_accessible_p.h ) qt_internal_extend_target(WebEngineWidgets CONDITION QT_FEATURE_webengine_printing_and_pdf diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index e28f70b5f..5b47d67bf 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -32,7 +32,7 @@ #include <QQuickWidget> #if QT_CONFIG(accessibility) -#include "qwebengine_accessible.h" +#include "qwebengine_accessible_p.h" #endif #if QT_CONFIG(action) diff --git a/src/webenginewidgets/qwebengine_accessible.cpp b/src/webenginewidgets/qwebengine_accessible.cpp index 6880a5a3a..cbdd90104 100644 --- a/src/webenginewidgets/qwebengine_accessible.cpp +++ b/src/webenginewidgets/qwebengine_accessible.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "qwebengine_accessible.h" +#include "qwebengine_accessible_p.h" #include "qwebengineview.h" #include "qwebengineview_p.h" diff --git a/src/webenginewidgets/qwebengine_accessible.h b/src/webenginewidgets/qwebengine_accessible_p.h index f47996cf7..99604d90d 100644 --- a/src/webenginewidgets/qwebengine_accessible.h +++ b/src/webenginewidgets/qwebengine_accessible_p.h @@ -4,6 +4,17 @@ #ifndef QWEBENGINE_ACCESSIBLE_H #define QWEBENGINE_ACCESSIBLE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QPointer> #include <QtWidgets/QAccessibleWidget> |