diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-07-13 14:40:43 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-20 09:21:44 +0000 |
commit | 4c7b47a3b46594fa54dda993eebc08c74d1b3a3c (patch) | |
tree | e1e078776ccb8fa60eac3f4b4c4b150f5a47e404 /src/webenginequick | |
parent | cd1799eecf578fa42ee6e31f5caefe7db191fd37 (diff) |
Clean up quick API
Change-Id: I9407d407b203b8e2bb13768e5a899624ea47282a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 6f97b43350f7949029045a37f226dd81e23e25d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginequick')
26 files changed, 152 insertions, 169 deletions
diff --git a/src/webenginequick/api/qquickwebengineaction_p.h b/src/webenginequick/api/qquickwebengineaction_p.h index d07694150..5cb9e64d5 100644 --- a/src/webenginequick/api/qquickwebengineaction_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p.h @@ -51,10 +51,10 @@ // We mean it. // -#include <QObject> -#include <QtQml/qqml.h> #include "qtwebenginequickglobal_p.h" -#include <QVariant> +#include <QtCore/qobject.h> +#include <QtCore/qvariant.h> +#include <QtQml/qqml.h> #include <QtQml/qqmlregistration.h> namespace QtWebEngineCore { @@ -94,9 +94,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QQuickWebEngineAction) - friend class QQuickWebEngineView; friend class QQuickWebEngineViewPrivate; - friend class QtWebEngineCore::UIDelegatesManager; friend class QQuickContextMenuBuilder; QScopedPointer<QQuickWebEngineActionPrivate> d_ptr; diff --git a/src/webenginequick/api/qquickwebengineaction_p_p.h b/src/webenginequick/api/qquickwebengineaction_p_p.h index e5093f89f..656c0fe33 100644 --- a/src/webenginequick/api/qquickwebengineaction_p_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p_p.h @@ -51,9 +51,9 @@ // We mean it. // -#include <QObject> #include "qtwebenginequickglobal_p.h" -#include <QVariant> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h index 54cf54cfb..c32f4077b 100644 --- a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h +++ b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h @@ -53,12 +53,12 @@ #include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> -#include <QtCore/QDateTime> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QUrl> -#include <QtCore/QList> -#include <QtQml/QQmlListProperty> +#include <QtCore/qdatetime.h> +#include <QtCore/qlist.h> +#include <QtCore/qobject.h> +#include <QtCore/qsharedpointer.h> +#include <QtCore/qurl.h> +#include <QtQml/qqmllist.h> #include <QtQml/qqmlregistration.h> namespace QtWebEngineCore { diff --git a/src/webenginequick/api/qquickwebenginedialogrequests_p.h b/src/webenginequick/api/qquickwebenginedialogrequests_p.h index a9f745df9..2e99d6fc7 100644 --- a/src/webenginequick/api/qquickwebenginedialogrequests_p.h +++ b/src/webenginequick/api/qquickwebenginedialogrequests_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QQUICKWEBENGINDIALOGREQUESTS_H -#define QQUICKWEBENGINDIALOGREQUESTS_H +#ifndef QQUICKWEBENGINDIALOGREQUESTS_P_H +#define QQUICKWEBENGINDIALOGREQUESTS_P_H // // W A R N I N G @@ -52,10 +52,10 @@ // #include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> -#include <QtCore/QUrl> -#include <QtCore/QWeakPointer> -#include <QtCore/QRect> -#include <QtGui/QColor> +#include <QtCore/qpoint.h> +#include <QtCore/qsharedpointer.h> +#include <QtCore/qurl.h> +#include <QtGui/qcolor.h> #include <QtQml/qqmlregistration.h> namespace QtWebEngineCore { @@ -280,4 +280,4 @@ private: QT_END_NAMESPACE -#endif // QQUICKWEBENGINDIALOGREQUESTS_H +#endif // QQUICKWEBENGINDIALOGREQUESTS_P_H diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider.cpp b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp index d19954620..2a335418c 100644 --- a/src/webenginequick/api/qquickwebenginefaviconprovider.cpp +++ b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp @@ -39,15 +39,17 @@ #include "qquickwebenginefaviconprovider_p_p.h" -#include "profile_adapter.h" +#include "qquickwebengineprofile.h" #include "qquickwebenginesettings_p.h" #include "qquickwebengineview_p_p.h" + +#include "profile_adapter.h" #include "web_contents_adapter.h" -#include <QtCore/QMimeDatabase> -#include <QtCore/QTimer> -#include <QtGui/QIcon> -#include <QtGui/QPixmap> +#include <QtCore/qmimedatabase.h> +#include <QtCore/qtimer.h> +#include <QtGui/qicon.h> +#include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h index 7b39ce964..94007bc94 100644 --- a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h +++ b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h @@ -52,11 +52,11 @@ // #include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> -#include <QtCore/QList> -#include <QtCore/QRunnable> -#include <QtCore/QThreadPool> -#include <QtGui/QImage> -#include <QtQuick/QQuickImageProvider> +#include <QtCore/qlist.h> +#include <QtCore/qrunnable.h> +#include <QtCore/qthreadpool.h> +#include <QtGui/qimage.h> +#include <QtQuick/qquickimageprovider.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp index 1c32c9ffb..3917730df 100644 --- a/src/webenginequick/api/qquickwebengineprofile.cpp +++ b/src/webenginequick/api/qquickwebengineprofile.cpp @@ -43,6 +43,7 @@ #include "qquickwebenginesettings_p.h" #include "qquickwebenginescriptcollection.h" #include "qquickwebengineview_p_p.h" + #include "profile_adapter.h" #include "web_engine_settings.h" @@ -53,10 +54,9 @@ #include <QtWebEngineCore/private/qwebenginedownloadrequest_p.h> #include <QtWebEngineCore/qwebengineurlscheme.h> -#include <QFileInfo> -#include <QDir> -#include <QQmlEngine> -#include <QtQml/QQmlInfo> +#include <QtCore/qdir.h> +#include <QtCore/qfileinfo.h> +#include <QtQml/qqmlengine.h> using QtWebEngineCore::ProfileAdapter; diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h index b6039c123..e594b5982 100644 --- a/src/webenginequick/api/qquickwebengineprofile.h +++ b/src/webenginequick/api/qquickwebengineprofile.h @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadRequest; -class QWebEngineScript; class QQuickWebEngineSettings; class QWebEngineClientCertificateStore; class QWebEngineCookieStore; @@ -173,7 +172,6 @@ private: QQuickWebEngineSettings *settings() const; friend class FaviconImageResponseRunnable; - friend class QQuickWebEngineSettings; friend class QQuickWebEngineSingleton; friend class QQuickWebEngineViewPrivate; friend class QQuickWebEngineView; diff --git a/src/webenginequick/api/qquickwebengineprofile_p.h b/src/webenginequick/api/qquickwebengineprofile_p.h index 8e465d876..5ff3c6913 100644 --- a/src/webenginequick/api/qquickwebengineprofile_p.h +++ b/src/webenginequick/api/qquickwebengineprofile_p.h @@ -52,19 +52,20 @@ // #include "profile_adapter_client.h" -#include "profile_adapter.h" #include "qquickwebengineprofile.h" -#include <QExplicitlySharedDataPointer> -#include <QMap> -#include <QPointer> -#include <QSharedPointer> +#include <QtCore/qmap.h> +#include <QtCore/qpointer.h> +#include <QtCore/qsharedpointer.h> + +namespace QtWebEngineCore { +class ProfileAdapter; +} QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadRequest; class QQuickWebEngineSettings; -class QQuickWebEngineViewPrivate; class QQuickWebEngineScriptCollection; class QQuickWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient { diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.cpp b/src/webenginequick/api/qquickwebenginescriptcollection.cpp index 6537e8e67..6de9287c9 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.cpp +++ b/src/webenginequick/api/qquickwebenginescriptcollection.cpp @@ -40,7 +40,7 @@ #include "qquickwebenginescriptcollection.h" #include "qwebenginescriptcollection.h" #include <QtWebEngineCore/private/qwebenginescriptcollection_p.h> -#include <QtQml/QQmlInfo> +#include <QtQml/qqmlinfo.h> #include <QtQml/private/qqmlengine_p.h> #include <QtQml/private/qv4scopedvalue_p.h> #include <QtQml/private/qv4arrayobject_p.h> diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection.h index 200fb0547..f7210302a 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.h +++ b/src/webenginequick/api/qquickwebenginescriptcollection.h @@ -40,13 +40,12 @@ #ifndef QQUICKWEBENGINESCRIPTCOLLECTION_H #define QQUICKWEBENGINESCRIPTCOLLECTION_H -#include <QtWebEngineQuick/qtwebenginequickglobal.h> -#include <QtWebEngineCore/qwebenginescript.h> -#include <QtCore/qscopedpointer.h> #include <QtCore/qlist.h> -#include <QtCore/qset.h> #include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> #include <QtQml/qjsvalue.h> +#include <QtWebEngineCore/qwebenginescript.h> +#include <QtWebEngineQuick/qtwebenginequickglobal.h> QT_BEGIN_NAMESPACE class QWebEngineScriptCollection; diff --git a/src/webenginequick/api/qquickwebenginesettings.cpp b/src/webenginequick/api/qquickwebenginesettings.cpp index aba47dfe6..f453fc746 100644 --- a/src/webenginequick/api/qquickwebenginesettings.cpp +++ b/src/webenginequick/api/qquickwebenginesettings.cpp @@ -37,17 +37,13 @@ ** ****************************************************************************/ +#include "qquickwebengineprofile.h" #include "qquickwebenginesettings_p.h" #include "web_engine_settings.h" -#include <QtWebEngineQuick/QQuickWebEngineProfile> -#include <QtCore/QList> - QT_BEGIN_NAMESPACE -using QtWebEngineCore::WebEngineSettings; - QQuickWebEngineSettings::QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings) : d_ptr(new QWebEngineSettings(parentSettings ? parentSettings->d_ptr.data() : nullptr)) { } diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h index 9eb6dd805..3f540fa12 100644 --- a/src/webenginequick/api/qquickwebenginesettings_p.h +++ b/src/webenginequick/api/qquickwebenginesettings_p.h @@ -51,14 +51,10 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> -#include <QObject> -#include <QScopedPointer> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> #include <QtQml/qqmlregistration.h> - -namespace QtWebEngineCore { -class WebEngineSettings; -} +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebenginesingleton.cpp b/src/webenginequick/api/qquickwebenginesingleton.cpp index a35404aa8..40ae87a68 100644 --- a/src/webenginequick/api/qquickwebenginesingleton.cpp +++ b/src/webenginequick/api/qquickwebenginesingleton.cpp @@ -37,10 +37,9 @@ ** ****************************************************************************/ -#include "qquickwebenginesingleton_p.h" - +#include "qquickwebengineprofile.h" #include "qquickwebenginesettings_p.h" -#include <QtWebEngineQuick/QQuickWebEngineProfile> +#include "qquickwebenginesingleton_p.h" QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebenginesingleton_p.h b/src/webenginequick/api/qquickwebenginesingleton_p.h index 456941ee3..84132ed45 100644 --- a/src/webenginequick/api/qquickwebenginesingleton_p.h +++ b/src/webenginequick/api/qquickwebenginesingleton_p.h @@ -51,10 +51,10 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> -#include <QtWebEngineCore/qwebenginescript.h> #include <QtCore/qobject.h> #include <QtQml/qqml.h> +#include <QtWebEngineCore/qwebenginescript.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h index a9d7f6711..b389818fc 100644 --- a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h +++ b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtQuick/QQuickImageProvider> +#include <QtQuick/qquickimageprovider.h> #include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 50ea17766..e26d5cf25 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -37,67 +37,73 @@ ** ****************************************************************************/ -#include "qquickwebengineview_p.h" -#include "qquickwebengineview_p_p.h" -#include "authentication_dialog_controller.h" -#include "profile_adapter.h" -#include "file_picker_controller.h" -#include "find_text_helper.h" -#include "javascript_dialog_controller.h" -#include "touch_selection_menu_controller.h" - #include "qquickwebengineaction_p.h" #include "qquickwebengineaction_p_p.h" #include "qquickwebengineclientcertificateselection_p.h" #include "qquickwebenginedialogrequests_p.h" #include "qquickwebenginefaviconprovider_p_p.h" #include "qquickwebenginenewviewrequest_p.h" +#include "qquickwebengineprofile.h" #include "qquickwebengineprofile_p.h" +#include "qquickwebenginescriptcollection.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginetouchhandleprovider_p_p.h" -#include "qwebenginecertificateerror.h" -#include "qwebenginefindtextresult.h" -#include "qwebenginefullscreenrequest.h" -#include "qwebengineloadinginfo.h" -#include "qwebenginenavigationrequest.h" -#include "qwebenginequotarequest.h" -#include "qwebenginescriptcollection.h" +#include "qquickwebengineview_p.h" +#include "qquickwebengineview_p_p.h" + +#include "authentication_dialog_controller.h" +#include "profile_adapter.h" +#include "file_picker_controller.h" +#include "find_text_helper.h" +#include "javascript_dialog_controller.h" +#include "render_widget_host_view_qt_delegate_quick.h" +#include "render_widget_host_view_qt_delegate_quickwindow.h" +#include "touch_selection_menu_controller.h" +#include "ui_delegates_manager.h" +#include "web_contents_adapter.h" + +#include <QtWebEngineCore/qwebenginecertificateerror.h> +#include <QtWebEngineCore/qwebenginefindtextresult.h> +#include <QtWebEngineCore/qwebenginefullscreenrequest.h> +#include <QtWebEngineCore/qwebengineloadinginfo.h> +#include <QtWebEngineCore/qwebenginenavigationrequest.h> +#include <QtWebEngineCore/qwebenginequotarequest.h> +#include <QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h> +#include <QtWebEngineCore/qwebenginescriptcollection.h> #include <QtWebEngineCore/private/qwebenginecontextmenurequest_p.h> #include <QtWebEngineCore/private/qwebenginehistory_p.h> #include <QtWebEngineCore/private/qwebenginenewwindowrequest_p.h> #include <QtWebEngineCore/private/qwebenginescriptcollection_p.h> -#include "qwebengineregisterprotocolhandlerrequest.h" -#if QT_CONFIG(webenginequick_testsupport) -#include <QtWebEngineTestSupport/private/qquickwebenginetestsupport_p.h> + +#include <QtCore/qloggingcategory.h> +#include <QtCore/qmimedata.h> +#include <QtCore/qurl.h> +#include <QtCore/qtimer.h> +#include <QtGui/qclipboard.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/private/qguiapplication_p.h> +#include <QtGui/qpa/qplatformintegration.h> +#include <QtQml/qqmlcomponent.h> +#include <QtQml/qqmlcontext.h> +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlproperty.h> + +#if QT_CONFIG(webengine_printing_and_pdf) +#include <QtCore/qmargins.h> +#include <QtGui/qpagelayout.h> +#include <QtGui/qpageranges.h> +#include <QtGui/qpagesize.h> #endif -#include "render_widget_host_view_qt_delegate_quick.h" -#include "render_widget_host_view_qt_delegate_quickwindow.h" -#include "ui_delegates_manager.h" -#include "web_contents_adapter.h" -#include "web_engine_settings.h" - -#include <QClipboard> -#include <QGuiApplication> -#include <QLoggingCategory> -#include <QMarginsF> -#include <QMimeData> -#include <QPageLayout> -#include <QPageRanges> -#include <QPageSize> -#include <QQmlComponent> -#include <QQmlContext> -#include <QQmlEngine> -#include <QQmlProperty> #if QT_CONFIG(webengine_webchannel) -#include <QQmlWebChannel> +#include <QtWebChannel/qqmlwebchannel.h> #endif -#include <QQuickWebEngineProfile> -#include <QScreen> -#include <QUrl> -#include <QTimer> -#include <QtGui/private/qguiapplication_p.h> -#include <QtGui/qpa/qplatformintegration.h> + +#if QT_CONFIG(webenginequick_testsupport) +#include <QtWebEngineTestSupport/private/qquickwebenginetestsupport_p.h> +#endif + + QT_BEGIN_NAMESPACE using namespace QtWebEngineCore; diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h index 0d23f9d6d..2e3252777 100644 --- a/src/webenginequick/api/qquickwebengineview_p.h +++ b/src/webenginequick/api/qquickwebengineview_p.h @@ -53,10 +53,9 @@ #include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> -#include <QQuickItem> #include <QtGui/qcolor.h> #include <QtQml/qqmlregistration.h> -#include "qquickwebengineprofile.h" +#include <QtQuick/qquickitem.h> namespace QtWebEngineCore { class RenderWidgetHostViewQtDelegateQuick; @@ -73,7 +72,9 @@ class QQuickWebEngineColorDialogRequest; class QQuickWebEngineFileDialogRequest; class QQuickWebEngineJavaScriptDialogRequest; class QQuickWebEngineNewViewRequest; +class QQuickWebEngineProfile; class QQuickWebEngineSettings; +class QQuickWebEngineTestSupport; class QQuickWebEngineTooltipRequest; class QQuickWebEngineViewPrivate; class QWebEngineCertificateError; @@ -88,10 +89,6 @@ class QWebEngineQuotaRequest; class QWebEngineRegisterProtocolHandlerRequest; class QQuickWebEngineScriptCollection; -#if QT_CONFIG(webenginequick_testsupport) -class QQuickWebEngineTestSupport; -#endif - class Q_WEBENGINEQUICK_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_OBJECT Q_CLASSINFO("RegisterEnumClassesUnscoped", "false") diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h index 82fca680d..4f07ce909 100644 --- a/src/webenginequick/api/qquickwebengineview_p_p.h +++ b/src/webenginequick/api/qquickwebengineview_p_p.h @@ -52,35 +52,31 @@ // #include "qquickwebengineview_p.h" -#include "qquickwebenginescriptcollection.h" #include "render_view_context_menu_qt.h" #include "touch_handle_drawable_client.h" #include "web_contents_adapter_client.h" -#include <QPointer> -#include <QScopedPointer> -#include <QSharedData> -#include <QString> #include <QtCore/qcompilerdetection.h> +#include <QtCore/qpointer.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qsharedpointer.h> +#include <QtCore/qstring.h> #include <QtGui/qaccessibleobject.h> namespace QtWebEngineCore { class RenderWidgetHostViewQtDelegateQuick; -class TouchHandleDrawableClient; class TouchSelectionMenuController; class UIDelegatesManager; class WebContentsAdapter; } QT_BEGIN_NAMESPACE -class QQuickWebEngineView; class QQmlComponent; -class QQmlContext; -class QWebEngineContextMenuRequest; -class QQuickWebEngineSettings; class QQuickWebEngineFaviconProvider; -class QQuickWebEngineProfilePrivate; -class QQuickWebEngineTouchHandleProvider; +class QQuickWebEngineScriptCollection; +class QQuickWebEngineSettings; +class QQuickWebEngineView; +class QWebEngineContextMenuRequest; class QWebEngineFindTextResult; class QWebEngineHistory; diff --git a/src/webenginequick/api/qtwebenginequickglobal.cpp b/src/webenginequick/api/qtwebenginequickglobal.cpp index 68e4a7c3b..d441c9f36 100644 --- a/src/webenginequick/api/qtwebenginequickglobal.cpp +++ b/src/webenginequick/api/qtwebenginequickglobal.cpp @@ -37,9 +37,9 @@ ** ****************************************************************************/ +#include <QtCore/qcoreapplication.h> +#include <QtQuick/qquickwindow.h> #include <QtWebEngineQuick/qtwebenginequickglobal.h> -#include <QCoreApplication> -#include <QQuickWindow> namespace QtWebEngineCore { diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp b/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp index a2b089ec7..c0a48ccd5 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp @@ -44,16 +44,11 @@ #include "qquickwebengineview_p.h" #include "qquickwebengineview_p_p.h" -#include <QGuiApplication> -#include <QQuickWindow> -#include <QSGImageNode> -#include <QVariant> -#include <QWindow> - -#if defined(Q_OS_MACOS) && QT_CONFIG(opengl) -#include <QOpenGLContext> -#include <QSurfaceFormat> -#endif +#include <QtCore/qvariant.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qwindow.h> +#include <QtQuick/qquickwindow.h> +#include <QtQuick/qsgimagenode.h> namespace QtWebEngineCore { diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quick.h b/src/webenginequick/render_widget_host_view_qt_delegate_quick.h index 0fd4d380f..1580e0614 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quick.h +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quick.h @@ -43,8 +43,8 @@ #include "compositor/compositor.h" #include "render_widget_host_view_qt_delegate.h" -#include <QAccessibleObject> -#include <QQuickItem> +#include <QtGui/qaccessibleobject.h> +#include <QtQuick/qquickitem.h> QT_BEGIN_NAMESPACE class QQuickWebEngineView; 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 48009cdad..7cae38b2e 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp @@ -37,10 +37,10 @@ ** ****************************************************************************/ +#include "render_widget_host_view_qt_delegate_quick.h" #include "render_widget_host_view_qt_delegate_quickwindow.h" -#include "qquickwebengineview_p_p.h" -#include <QQuickItem> +#include <QtQuick/qquickitem.h> namespace QtWebEngineCore { diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h index f81bcc637..f7dfd1a05 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h @@ -42,13 +42,13 @@ #include "render_widget_host_view_qt_delegate.h" -#include "render_widget_host_view_qt_delegate_quick.h" - -#include <QQuickWindow> -#include <QScopedPointer> +#include <QtCore/qscopedpointer.h> +#include <QtQuick/qquickwindow.h> namespace QtWebEngineCore { +class RenderWidgetHostViewQtDelegateQuick; + class RenderWidgetHostViewQtDelegateQuickWindow : public QQuickWindow , public RenderWidgetHostViewQtDelegate { public: diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp index dc983d408..849dd3e6d 100644 --- a/src/webenginequick/ui_delegates_manager.cpp +++ b/src/webenginequick/ui_delegates_manager.cpp @@ -39,7 +39,9 @@ #include "ui_delegates_manager.h" +#include "api/qquickwebengineaction_p.h" #include "api/qquickwebengineview_p.h" + #include <authentication_dialog_controller.h> #include <color_chooser_controller.h> #include <file_picker_controller.h> @@ -47,16 +49,15 @@ #include <touch_selection_menu_controller.h> #include <web_contents_adapter_client.h> -#include <QFileInfo> -#include <QQmlContext> -#include <QQmlEngine> -#include <QQmlProperty> -#include <QQuickWindow> -#include <QCursor> -#include <QList> -#include <QScreen> -#include <QTimer> -#include <QGuiApplication> +#include <QtCore/qfileinfo.h> +#include <QtCore/qlist.h> +#include <QtCore/qtimer.h> +#include <QtGui/qcursor.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qscreen.h> +#include <QtQml/qqmlcontext.h> +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlproperty.h> // Uncomment for QML debugging //#define UI_DELEGATES_DEBUG diff --git a/src/webenginequick/ui_delegates_manager.h b/src/webenginequick/ui_delegates_manager.h index 94c2987e1..3ab10ad94 100644 --- a/src/webenginequick/ui_delegates_manager.h +++ b/src/webenginequick/ui_delegates_manager.h @@ -40,15 +40,12 @@ #ifndef UI_DELEGATES_MANAGER_H #define UI_DELEGATES_MANAGER_H -#include "api/qquickwebengineaction_p.h" -#include "qglobal.h" -#include "web_contents_adapter.h" -#include "web_contents_adapter_client.h" - -#include <QCoreApplication> -#include <QExplicitlySharedDataPointer> -#include <QPoint> -#include <QSharedPointer> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qpoint.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qsharedpointer.h> +#include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> #define FOR_EACH_COMPONENT_TYPE(F, SEPARATOR) \ F(Menu, menu) SEPARATOR \ @@ -72,17 +69,19 @@ QQmlComponent *COMPONENT##Component QT_BEGIN_NAMESPACE -class QQmlContext; class QQmlComponent; +class QQmlContext; +class QQmlEngine; class QQuickItem; +class QQuickWebEngineAction; class QQuickWebEngineView; -class QQmlEngine; QT_END_NAMESPACE namespace QtWebEngineCore { class AuthenticationDialogController; -class JavaScriptDialogController; +class ColorChooserController; class FilePickerController; +class JavaScriptDialogController; class TouchSelectionMenuController; const char *defaultPropertyName(QObject *obj); |