qtqmlandroidglobal_p.h -> qtnativeandroidglobal_p.h

Change-Id: If5cc8742adcc94ed5fe97435f7a427ff3c49e0b3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

11 files changed, 13 insertions, 13 deletions

diff --git a/src/android/android.pri b/src/android/android.pri
index a5127d2..c3389dc 100644
--- a/src/android/android.pri
+++ b/src/android/android.pri
@@ -2,6 +2,7 @@ INCLUDEPATH += $$PWD
 
 HEADERS += \
     $$PWD/qnativeandroidr_p.h
+    $$PWD/qtnativeandroidglobal_p.h
 
 SOURCES += \
     $$PWD/qnativeandroidr.cpp
diff --git a/src/android/core/core.pri b/src/android/core/core.pri
index c63af8d..47850f3 100644
--- a/src/android/core/core.pri
+++ b/src/android/core/core.pri
@@ -3,8 +3,7 @@ INCLUDEPATH += $$PWD
 HEADERS += \
     $$PWD/qnativeandroidobject_p.h \
     $$PWD/qnativeandroidoptional_p.h \
-    $$PWD/qtqmlandroidfunctions_p.h \
-    $$PWD/qtqmlandroidglobal_p.h
+    $$PWD/qtqmlandroidfunctions_p.h
 
 SOURCES += \
     $$PWD/qnativeandroidobject.cpp \
diff --git a/src/android/core/qnativeandroidobject_p.h b/src/android/core/qnativeandroidobject_p.h
index d8b5d52..fe7ef1c 100644
--- a/src/android/core/qnativeandroidobject_p.h
+++ b/src/android/core/qnativeandroidobject_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qreadwritelock.h>
diff --git a/src/android/graphics/qnativeandroidcolor_p.h b/src/android/graphics/qnativeandroidcolor_p.h
index 8d37fdb..10b7669 100644
--- a/src/android/graphics/qnativeandroidcolor_p.h
+++ b/src/android/graphics/qnativeandroidcolor_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtQml/qqmlengine.h>
diff --git a/src/android/qnativeandroidr_p.h b/src/android/qnativeandroidr_p.h
index a2d9eff..b65cd82 100644
--- a/src/android/qnativeandroidr_p.h
+++ b/src/android/qnativeandroidr_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtQml/qqmlpropertymap.h>
diff --git a/src/android/core/qtqmlandroidglobal_p.h b/src/android/qtnativeandroidglobal_p.h
index 2737a4d..03389e2 100644
--- a/src/android/core/qtqmlandroidglobal_p.h
+++ b/src/android/qtnativeandroidglobal_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTQMLANDROIDGLOBAL_P_H
-#define QTQMLANDROIDGLOBAL_P_H
+#ifndef QTNATIVEANDROIDGLOBAL_P_H
+#define QTNATIVEANDROIDGLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -73,4 +73,4 @@ namespace QtQmlAndroid {
 
 QT_END_NAMESPACE
 
-#endif // QTQMLANDROIDGLOBAL_P_H
+#endif // QTNATIVEANDROIDGLOBAL_P_H
diff --git a/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
index 46d1520..e65ad64 100644
--- a/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 #include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
 #include <QtAndroidExtras/qandroidjniobject.h>
diff --git a/src/android/view/animation/qnativeandroidbounceinterpolator_p.h b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
index d1da8b3..92f3ac2 100644
--- a/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 #include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
 #include <QtAndroidExtras/qandroidjniobject.h>
diff --git a/src/android/view/animation/qnativeandroidlinearinterpolator_p.h b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
index c847303..8a138e0 100644
--- a/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 #include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
 #include <QtAndroidExtras/qandroidjniobject.h>
diff --git a/src/android/view/qnativeandroidgravity_p.h b/src/android/view/qnativeandroidgravity_p.h
index 82ac038..9d064fd 100644
--- a/src/android/view/qnativeandroidgravity_p.h
+++ b/src/android/view/qnativeandroidgravity_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 
 #include <QtCore/qobject.h>
 
diff --git a/src/android/widget/qnativeandroidtabspec_p.h b/src/android/widget/qnativeandroidtabspec_p.h
index 553ec96..4b3b895 100644
--- a/src/android/widget/qnativeandroidtabspec_p.h
+++ b/src/android/widget/qnativeandroidtabspec_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
+#include <QtQmlAndroid/private/qtnativeandroidglobal_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtAndroidExtras/qandroidjniobject.h>