Fix Qt include conventions in public headers

Specify the module and use the .h files.

Change-Id: I7c2bb1a635d10e25c874f18736120efde6ce2ca4
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 3b363345a3e75eb10827f67b995ae9472a6d0e8e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

15 files changed, 39 insertions, 37 deletions

diff --git a/src/core/api/qwebenginecertificateerror.h b/src/core/api/qwebenginecertificateerror.h
index ffcebaf9b..b5f85bb68 100644
--- a/src/core/api/qwebenginecertificateerror.h
+++ b/src/core/api/qwebenginecertificateerror.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
-#include <QtNetwork/QSslCertificate>
+#include <QtNetwork/qsslcertificate.h>
 
 namespace QtWebEngineCore {
 class WebContentsDelegateQt;
diff --git a/src/core/api/qwebenginecontextmenurequest.h b/src/core/api/qwebenginecontextmenurequest.h
index e840a2188..5bd8f7fa6 100644
--- a/src/core/api/qwebenginecontextmenurequest.h
+++ b/src/core/api/qwebenginecontextmenurequest.h
@@ -41,10 +41,10 @@
 #define QWEBENGINECONTEXTMENUREQUEST_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
-#include <QtCore/QPoint>
-#include <QScopedPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qscopedpointer.h>
 
 namespace extensions {
 class MimeHandlerViewGuestDelegateQt;
diff --git a/src/core/api/qwebenginedownloadrequest.h b/src/core/api/qwebenginedownloadrequest.h
index 29ba47eaf..76f472b62 100644
--- a/src/core/api/qwebenginedownloadrequest.h
+++ b/src/core/api/qwebenginedownloadrequest.h
@@ -43,7 +43,7 @@
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 #include <QtCore/qobject.h>
-#include <QtCore/QUrl>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/api/qwebenginefindtextresult.h b/src/core/api/qwebenginefindtextresult.h
index 246e689c3..ae49912aa 100644
--- a/src/core/api/qwebenginefindtextresult.h
+++ b/src/core/api/qwebenginefindtextresult.h
@@ -41,8 +41,8 @@
 #define QWEBENGINEFINDTEXTRESULT_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/QObject>
-#include <QtCore/QSharedData>
+#include <QtCore/qobject.h>
+#include <QtCore/qshareddata.h>
 
 namespace QtWebEngineCore {
 class FindTextHelper;
diff --git a/src/core/api/qwebenginehistory.h b/src/core/api/qwebenginehistory.h
index ef3747330..150a1e151 100644
--- a/src/core/api/qwebenginehistory.h
+++ b/src/core/api/qwebenginehistory.h
@@ -41,7 +41,7 @@
 #define QWEBENGINEHISTORY_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qdatetime.h>
diff --git a/src/core/api/qwebengineloadinginfo.h b/src/core/api/qwebengineloadinginfo.h
index 8aacb0281..d696fd595 100644
--- a/src/core/api/qwebengineloadinginfo.h
+++ b/src/core/api/qwebengineloadinginfo.h
@@ -42,8 +42,8 @@
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QObject>
-#include <QUrl>
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
 
 namespace QtWebEngineCore {
 class WebContentsAdapter;
diff --git a/src/core/api/qwebenginenavigationrequest.h b/src/core/api/qwebenginenavigationrequest.h
index 45ed4fe6d..32ab00179 100644
--- a/src/core/api/qwebenginenavigationrequest.h
+++ b/src/core/api/qwebenginenavigationrequest.h
@@ -40,9 +40,9 @@
 #ifndef QWEBENGINENAVIGATIONREQUEST_H
 #define QWEBENGINENAVIGATIONREQUEST_H
 
-#include <qtwebenginecoreglobal.h>
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/api/qwebenginenewwindowrequest.h b/src/core/api/qwebenginenewwindowrequest.h
index 89a169722..dd7256a03 100644
--- a/src/core/api/qwebenginenewwindowrequest.h
+++ b/src/core/api/qwebenginenewwindowrequest.h
@@ -41,11 +41,11 @@
 #define QWEBENGINENEWWINDOWREQUEST_P_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/QObject>
-#include <QtCore/QRect>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QUrl>
+#include <QtCore/qobject.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qurl.h>
 
 namespace QtWebEngineCore {
 class WebContentsAdapter;
diff --git a/src/core/api/qwebenginenotification.h b/src/core/api/qwebenginenotification.h
index 08fd629be..cd0fe0c67 100644
--- a/src/core/api/qwebenginenotification.h
+++ b/src/core/api/qwebenginenotification.h
@@ -42,10 +42,10 @@
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QUrl>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qurl.h>
 
 namespace QtWebEngineCore {
 class UserNotificationController;
diff --git a/src/core/api/qwebenginequotarequest.h b/src/core/api/qwebenginequotarequest.h
index da72116c8..930a13f01 100644
--- a/src/core/api/qwebenginequotarequest.h
+++ b/src/core/api/qwebenginequotarequest.h
@@ -40,9 +40,10 @@
 #ifndef QWEBENGINEQUOTAREQUEST_H
 #define QWEBENGINEQUOTAREQUEST_H
 
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
+
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
-#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 namespace QtWebEngineCore {
 class QuotaPermissionContextQt;
diff --git a/src/core/api/qwebengineregisterprotocolhandlerrequest.h b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
index 67caf1590..b83827c92 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerrequest.h
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
@@ -40,9 +40,10 @@
 #ifndef QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
 #define QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
 
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
+
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
-#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 namespace QtWebEngineCore {
 class RegisterProtocolHandlerRequestController;
diff --git a/src/core/api/qwebenginescript.h b/src/core/api/qwebenginescript.h
index a43f485a1..03964932c 100644
--- a/src/core/api/qwebenginescript.h
+++ b/src/core/api/qwebenginescript.h
@@ -41,9 +41,9 @@
 #define QWEBENGINESCRIPT_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/QUrl>
-#include <QtCore/QObject>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qurl.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qshareddata.h>
 
 namespace QtWebEngineCore {
 class UserScript;
diff --git a/src/core/user_notification_controller.h b/src/core/user_notification_controller.h
index f0d7e348f..b710641d0 100644
--- a/src/core/user_notification_controller.h
+++ b/src/core/user_notification_controller.h
@@ -40,11 +40,11 @@
 #ifndef DESKTOP_NOTIFICATION_CONTROLLER_H
 #define DESKTOP_NOTIFICATION_CONTROLLER_H
 
-#include "qtwebenginecoreglobal.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QtCore/QSharedPointer>
-#include <QtCore/QUrl>
-#include <QtGui/QImage>
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qurl.h>
+#include <QtGui/qimage.h>
 
 class GURL;
 
diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h
index 20aecfa56..b6039c123 100644
--- a/src/webenginequick/api/qquickwebengineprofile.h
+++ b/src/webenginequick/api/qquickwebengineprofile.h
@@ -41,9 +41,9 @@
 #define QQUICKWEBENGINEPROFILE_H
 
 #include <QtWebEngineQuick/qtwebenginequickglobal.h>
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QString>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qstring.h>
 #include <QtQml/qqmlregistration.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection.h
index 29255e25e..200fb0547 100644
--- a/src/webenginequick/api/qquickwebenginescriptcollection.h
+++ b/src/webenginequick/api/qquickwebenginescriptcollection.h
@@ -45,8 +45,8 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qset.h>
-#include <QtCore/QObject>
-#include <QtQml/QJSValue>
+#include <QtCore/qobject.h>
+#include <QtQml/qjsvalue.h>
 
 QT_BEGIN_NAMESPACE
 class QWebEngineScriptCollection;