Move QNativeInterface helpers to their own header file

The machinery is not needed for all translation units, so keep it out
of qglobal.h.

Change-Id: Ib0459a3f7bc036f56b0810eb750d4641f567f1fe
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

11 files changed, 16 insertions, 0 deletions

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 7cbfb76bee..f225bf0010 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -58,6 +58,7 @@
 #include <QtCore/QSharedPointer>
 #include <QtCore/private/qcoreapplication_p.h>
 
+#include <QtCore/qnativeinterface.h>
 #include <QtCore/private/qthread_p.h>
 
 #include <qpa/qwindowsysteminterface.h>
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 65d1c229ca..e0614a79a1 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -57,6 +57,7 @@
 #include <qlocale.h>
 #include <qevent.h>
 
+#include <QtCore/qnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h
index 3fc850a79d..e63c85cb72 100644
--- a/src/gui/kernel/qoffscreensurface.h
+++ b/src/gui/kernel/qoffscreensurface.h
@@ -42,6 +42,7 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/QObject>
+#include <QtCore/qnativeinterface.h>
 #include <QtGui/qsurface.h>
 Q_MOC_INCLUDE(<QScreen>)
 
diff --git a/src/gui/kernel/qoffscreensurface_platform.h b/src/gui/kernel/qoffscreensurface_platform.h
index addba347b9..3eb250ea5e 100644
--- a/src/gui/kernel/qoffscreensurface_platform.h
+++ b/src/gui/kernel/qoffscreensurface_platform.h
@@ -42,6 +42,7 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtGui/qoffscreensurface.h>
+#include <QtCore/qnativeinterface.h>
 
 #if defined(Q_OS_ANDROID)
 struct ANativeWindow;
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index 60f3e3d03a..4d8c568ed5 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -47,6 +47,7 @@
 #include <QtCore/qnamespace.h>
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
+#include <QtCore/qnativeinterface.h>
 
 #include <QtGui/QSurfaceFormat>
 
@@ -60,6 +61,7 @@
 #include <QtGui/qopengl.h>
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qopenglcontext_platform.h b/src/gui/kernel/qopenglcontext_platform.h
index 8275416f42..2e475c7fe9 100644
--- a/src/gui/kernel/qopenglcontext_platform.h
+++ b/src/gui/kernel/qopenglcontext_platform.h
@@ -46,6 +46,8 @@
 #include <QtGui/qopenglcontext.h>
 #include <QtGui/qwindowdefs.h>
 
+#include <QtCore/qnativeinterface.h>
+
 #if defined(Q_OS_MACOS)
 Q_FORWARD_DECLARE_OBJC_CLASS(NSOpenGLContext);
 #endif
diff --git a/src/gui/kernel/qplatformmenu_p.h b/src/gui/kernel/qplatformmenu_p.h
index feba5aa9ff..38f49ef983 100644
--- a/src/gui/kernel/qplatformmenu_p.h
+++ b/src/gui/kernel/qplatformmenu_p.h
@@ -53,6 +53,8 @@
 
 #include <QtGui/private/qtguiglobal_p.h>
 
+#include <QtCore/qnativeinterface.h>
+
 QT_BEGIN_NAMESPACE
 
 // ----------------- QNativeInterface -----------------
diff --git a/src/gui/kernel/qplatformoffscreensurface.h b/src/gui/kernel/qplatformoffscreensurface.h
index 06fa80b994..46bc65d467 100644
--- a/src/gui/kernel/qplatformoffscreensurface.h
+++ b/src/gui/kernel/qplatformoffscreensurface.h
@@ -54,6 +54,8 @@
 #include <QtGui/qoffscreensurface.h>
 #include <QtCore/qscopedpointer.h>
 
+#include <QtCore/qnativeinterface.h>
+
 QT_BEGIN_NAMESPACE
 
 class QOffscreenSurface;
diff --git a/src/gui/kernel/qplatformopenglcontext.h b/src/gui/kernel/qplatformopenglcontext.h
index eefe93111d..d747b3b7d4 100644
--- a/src/gui/kernel/qplatformopenglcontext.h
+++ b/src/gui/kernel/qplatformopenglcontext.h
@@ -59,6 +59,8 @@
 #include <QtGui/qopengl.h>
 #include <QtGui/qopenglcontext.h>
 
+#include <QtCore/qnativeinterface.h>
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h
index 53ce9e251f..bd149ccbac 100644
--- a/src/gui/kernel/qplatformscreen_p.h
+++ b/src/gui/kernel/qplatformscreen_p.h
@@ -54,6 +54,7 @@
 #include <QtGui/private/qtguiglobal_p.h>
 
 #include <QtCore/qpointer.h>
+#include <QtCore/qnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformwindow_p.h b/src/gui/kernel/qplatformwindow_p.h
index ffc3879bf1..22431e8d79 100644
--- a/src/gui/kernel/qplatformwindow_p.h
+++ b/src/gui/kernel/qplatformwindow_p.h
@@ -54,6 +54,7 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qbasictimer.h>
 #include <QtCore/qrect.h>
+#include <QtCore/qnativeinterface.h>
 
 QT_BEGIN_NAMESPACE