From 4c7b47a3b46594fa54dda993eebc08c74d1b3a3c Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 13 Jul 2021 14:40:43 +0200
Subject: 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>
---
 src/webenginequick/api/qquickwebengineview.cpp | 94 ++++++++++++++------------
 1 file changed, 50 insertions(+), 44 deletions(-)

(limited to 'src/webenginequick/api/qquickwebengineview.cpp')

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;
 
-- 
cgit v1.2.1