Fix more syncqt warnings

Change include form to follow standard

Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

10 files changed, 21 insertions, 9 deletions

diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 491999811..19b67876c 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -5,6 +5,7 @@ TEMPLATE = lib
 
 CONFIG += staticlib c++11
 QT += network core-private
+QT_PRIVATE += webenginecoreheaders-private
 
 # Don't create .prl file for this intermediate library because
 # their contents get used when linking against them, breaking
diff --git a/src/core/api/qwebenginecallback.h b/src/core/api/qwebenginecallback.h
index b675438f5..a8758df7d 100644
--- a/src/core/api/qwebenginecallback.h
+++ b/src/core/api/qwebenginecallback.h
@@ -37,7 +37,7 @@
 #ifndef QWEBENGINECALLBACK_H
 #define QWEBENGINECALLBACK_H
 
-#include "qtwebenginecoreglobal.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 #include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
 #include <QtCore/qshareddata.h>
diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index 73a4ac19a..b78f885ef 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -37,8 +37,8 @@
 #ifndef QWEBENGINECOOKIESTORE_H
 #define QWEBENGINECOOKIESTORE_H
 
-#include "qtwebenginecoreglobal.h"
-#include "qwebenginecallback.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
+#include <QtWebEngineCore/qwebenginecallback.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qscopedpointer.h>
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index 008df7751..9a13b3faf 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -37,7 +37,7 @@
 #ifndef QWEBENGINEURLREQUESTINFO_H
 #define QWEBENGINEURLREQUESTINFO_H
 
-#include "qtwebenginecoreglobal.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qurl.h>
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index 372ee9066..a3b7cf979 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -37,8 +37,8 @@
 #ifndef QWEBENINGEURLREQUESTINTERCEPTOR_H
 #define QWEBENINGEURLREQUESTINTERCEPTOR_H
 
-#include "qtwebenginecoreglobal.h"
-#include "qwebengineurlrequestinfo.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
+#include <QtWebEngineCore/qwebengineurlrequestinfo.h>
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qhash.h>
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h
index fc9f4d911..922299fd9 100644
--- a/src/core/api/qwebengineurlrequestjob.h
+++ b/src/core/api/qwebengineurlrequestjob.h
@@ -37,7 +37,7 @@
 #ifndef QWEBENGINEURLREQUESTJOB_H
 #define QWEBENGINEURLREQUESTJOB_H
 
-#include "qtwebenginecoreglobal.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qobject.h>
diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h
index fa24987c5..d9fc15250 100644
--- a/src/core/api/qwebengineurlschemehandler.h
+++ b/src/core/api/qwebengineurlschemehandler.h
@@ -37,7 +37,7 @@
 #ifndef QWEBENGINEURLSCHEMEHANDLER_H
 #define QWEBENGINEURLSCHEMEHANDLER_H
 
-#include "qtwebenginecoreglobal.h"
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 #include <QtCore/qobject.h>
 
diff --git a/src/core/core.pro b/src/core/core.pro
index 7ddad4ed6..09eee496f 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -1,8 +1,13 @@
 TEMPLATE = subdirs
 
+# core_headers is a dummy module to syncqt the headers so we can
+# use them by later targets
+core_headers.file = core_headers.pro
+
 # core_gyp_generator.pro is a dummy .pro file that is used by qmake
 # to generate our main .gyp file
 core_gyp_generator.file = core_gyp_generator.pro
+core_gyp_generator.depends = core_headers
 
 # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step.
 gyp_run.file = gyp_run.pro
@@ -31,5 +36,6 @@ SUBDIRS += core_gyp_generator
 }
 
 SUBDIRS += gyp_run \
+           core_headers \
            core_api \
            core_module
diff --git a/src/core/core_common.pri b/src/core/core_common.pri
index 1ea4e1862..9c29aea71 100644
--- a/src/core/core_common.pri
+++ b/src/core/core_common.pri
@@ -3,7 +3,7 @@
 
 TARGET = QtWebEngineCore
 QT += qml quick webchannel
-QT_PRIVATE += quick-private gui-private core-private
+QT_PRIVATE += quick-private gui-private core-private webenginecoreheaders-private
 
 # Make QtCreator happy.
 CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir()
diff --git a/src/core/core_headers.pro b/src/core/core_headers.pro
new file mode 100644
index 000000000..ebafe58ec
--- /dev/null
+++ b/src/core/core_headers.pro
@@ -0,0 +1,5 @@
+TARGET = QtWebEngineCore
+CONFIG += no_private_module header_module internal_module
+MODULE = webenginecoreheaders
+
+load(qt_module)