Q_QMLANDROID_EXPORT -> Q_NATIVEANDROID_EXPORT

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

86 files changed, 88 insertions, 88 deletions

diff --git a/src/android/app/qnativeandroidactionbar_p.h b/src/android/app/qnativeandroidactionbar_p.h
index 09298d7..f58d2ef 100644
--- a/src/android/app/qnativeandroidactionbar_p.h
+++ b/src/android/app/qnativeandroidactionbar_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidDrawable;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidActionBar : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidActionBar : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
diff --git a/src/android/app/qnativeandroidactivity_p.h b/src/android/app/qnativeandroidactivity_p.h
index 38db4a3..3a1f9e9 100644
--- a/src/android/app/qnativeandroidactivity_p.h
+++ b/src/android/app/qnativeandroidactivity_p.h
@@ -57,7 +57,7 @@ class QNativeAndroidMenu;
 class QNativeAndroidWindow;
 class QNativeAndroidActionBar;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidActivity : public QNativeAndroidContextWrapper
+class Q_NATIVEANDROID_EXPORT QNativeAndroidActivity : public QNativeAndroidContextWrapper
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidWindow *window READ window CONSTANT)
diff --git a/src/android/app/qnativeandroidalertdialog_p.h b/src/android/app/qnativeandroidalertdialog_p.h
index 8f239ce..200f9bd 100644
--- a/src/android/app/qnativeandroidalertdialog_p.h
+++ b/src/android/app/qnativeandroidalertdialog_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAlertDialog : public QNativeAndroidDialog
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAlertDialog : public QNativeAndroidDialog
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
diff --git a/src/android/app/qnativeandroiddialog_p.h b/src/android/app/qnativeandroiddialog_p.h
index c7e6f22..d6e6684 100644
--- a/src/android/app/qnativeandroiddialog_p.h
+++ b/src/android/app/qnativeandroiddialog_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidDialog : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidDialog : public QNativeAndroidContextual
 {
     Q_OBJECT
 
diff --git a/src/android/app/qnativeandroidservice_p.h b/src/android/app/qnativeandroidservice_p.h
index 520e1d6..8e7f087 100644
--- a/src/android/app/qnativeandroidservice_p.h
+++ b/src/android/app/qnativeandroidservice_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidService : public QNativeAndroidContextWrapper
+class Q_NATIVEANDROID_EXPORT QNativeAndroidService : public QNativeAndroidContextWrapper
 {
     Q_OBJECT
     Q_PROPERTY(bool sticky READ isSticky WRITE setSticky NOTIFY stickyChanged)
diff --git a/src/android/content/qnativeandroidcontext_p.h b/src/android/content/qnativeandroidcontext_p.h
index e881763..ddc5ab6 100644
--- a/src/android/content/qnativeandroidcontext_p.h
+++ b/src/android/content/qnativeandroidcontext_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidContext : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidContext : public QNativeAndroidContextual
 {
     Q_OBJECT
 
diff --git a/src/android/content/qnativeandroidcontextual_p.h b/src/android/content/qnativeandroidcontextual_p.h
index c2aa5f6..c467b76 100644
--- a/src/android/content/qnativeandroidcontextual_p.h
+++ b/src/android/content/qnativeandroidcontextual_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidContext;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidContextual : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidContextual : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidContext *context READ context NOTIFY contextChanged)
diff --git a/src/android/content/qnativeandroidcontextwrapper_p.h b/src/android/content/qnativeandroidcontextwrapper_p.h
index 81be30f..7ddb13e 100644
--- a/src/android/content/qnativeandroidcontextwrapper_p.h
+++ b/src/android/content/qnativeandroidcontextwrapper_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidContextWrapper : public QNativeAndroidContext
+class Q_NATIVEANDROID_EXPORT QNativeAndroidContextWrapper : public QNativeAndroidContext
 {
     Q_OBJECT
 
diff --git a/src/android/core/qnativeandroidobject_p.h b/src/android/core/qnativeandroidobject_p.h
index aae6805..8b5aeab 100644
--- a/src/android/core/qnativeandroidobject_p.h
+++ b/src/android/core/qnativeandroidobject_p.h
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidObject : public QObject, public QQmlParserStatus
+class Q_NATIVEANDROID_EXPORT QNativeAndroidObject : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged)
diff --git a/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h b/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h
index 8f83ba2..13f2ad9 100644
--- a/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h
+++ b/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidColorDrawable : public QNativeAndroidDrawable
+class Q_NATIVEANDROID_EXPORT QNativeAndroidColorDrawable : public QNativeAndroidDrawable
 {
     Q_OBJECT
     Q_PROPERTY(int color READ color WRITE setColor NOTIFY colorChanged)
diff --git a/src/android/graphics/drawable/qnativeandroiddrawable_p.h b/src/android/graphics/drawable/qnativeandroiddrawable_p.h
index 2324a75..8db4fe5 100644
--- a/src/android/graphics/drawable/qnativeandroiddrawable_p.h
+++ b/src/android/graphics/drawable/qnativeandroiddrawable_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidDrawable : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidDrawable : public QNativeAndroidObject
 {
     Q_OBJECT
 
diff --git a/src/android/graphics/qnativeandroidcolor_p.h b/src/android/graphics/qnativeandroidcolor_p.h
index 71fd33d..981f5d6 100644
--- a/src/android/graphics/qnativeandroidcolor_p.h
+++ b/src/android/graphics/qnativeandroidcolor_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidColor : public QObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidColor : public QObject
 {
     Q_OBJECT
     Q_ENUMS(Constants)
diff --git a/src/android/qnativeandroidr_p.h b/src/android/qnativeandroidr_p.h
index ce3678c..91a6006 100644
--- a/src/android/qnativeandroidr_p.h
+++ b/src/android/qnativeandroidr_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QJSEngine;
 class QQmlEngine;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidR : public QObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidR : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlPropertyMap *anim READ anim CONSTANT)
diff --git a/src/android/qtnativeandroidglobal_p.h b/src/android/qtnativeandroidglobal_p.h
index dcf3d1b..48b3442 100644
--- a/src/android/qtnativeandroidglobal_p.h
+++ b/src/android/qtnativeandroidglobal_p.h
@@ -56,12 +56,12 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
 #  if defined(QT_BUILD_NATIVEANDROID_LIB)
-#    define Q_QMLANDROID_EXPORT Q_DECL_EXPORT
+#    define Q_NATIVEANDROID_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_QMLANDROID_EXPORT Q_DECL_IMPORT
+#    define Q_NATIVEANDROID_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define Q_QMLANDROID_EXPORT
+#  define Q_NATIVEANDROID_EXPORT
 #endif
 
 namespace QtNativeAndroid {
diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
index ee25ccd..5bc56a3 100644
--- a/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidDrawerLayout : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidDrawerLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
 
diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h
index 4f9a382..96e65ca 100644
--- a/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidDrawerLayoutParams : public QNativeAndroidMarginLayoutParams
+class Q_NATIVEANDROID_EXPORT QNativeAndroidDrawerLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged) // TODO Gravity
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
index 7879109..1130c62 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidSwipeRefreshLayout : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidSwipeRefreshLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(bool refreshing READ isRefreshing WRITE setRefreshing NOTIFY refreshingChanged)
diff --git a/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h
index e83458b..769a703 100644
--- a/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h
+++ b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidActionBarDrawerToggle : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidActionBarDrawerToggle : public QNativeAndroidObject
 {
     Q_OBJECT
 
diff --git a/src/android/support/v7/widget/qnativeandroidcardview_p.h b/src/android/support/v7/widget/qnativeandroidcardview_p.h
index 3afc70c..dcbdcb6 100644
--- a/src/android/support/v7/widget/qnativeandroidcardview_p.h
+++ b/src/android/support/v7/widget/qnativeandroidcardview_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidCardView : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidCardView : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
diff --git a/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h b/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h
index a00ace6..fbb4584 100644
--- a/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 class QQmlComponent;
 class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRecyclerAdapter : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRecyclerAdapter : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
diff --git a/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
index 6026d76..7270741 100644
--- a/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidRecyclerAdapter;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRecyclerView : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRecyclerView : public QNativeAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged)
diff --git a/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
index 54bb1c8..d981599 100644
--- a/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAccelerateDecelerateInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAccelerateDecelerateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
 
diff --git a/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h
index 049e09c..d3e0aa9 100644
--- a/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAccelerateInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAccelerateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
diff --git a/src/android/view/animation/qnativeandroidalphaanimation_p.h b/src/android/view/animation/qnativeandroidalphaanimation_p.h
index 009cf46..a5db2da 100644
--- a/src/android/view/animation/qnativeandroidalphaanimation_p.h
+++ b/src/android/view/animation/qnativeandroidalphaanimation_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAlphaAnimation : public QNativeAndroidAnimation
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAlphaAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromAlpha READ fromAlpha WRITE setFromAlpha NOTIFY fromAlphaChanged)
diff --git a/src/android/view/animation/qnativeandroidanimation_p.h b/src/android/view/animation/qnativeandroidanimation_p.h
index a3329ac..0934cda 100644
--- a/src/android/view/animation/qnativeandroidanimation_p.h
+++ b/src/android/view/animation/qnativeandroidanimation_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidInterpolator;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAnimation : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAnimation : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int resource READ resource WRITE setResource NOTIFY resourceChanged)
diff --git a/src/android/view/animation/qnativeandroidanimationset_p.h b/src/android/view/animation/qnativeandroidanimationset_p.h
index d111b97..bb178ca 100644
--- a/src/android/view/animation/qnativeandroidanimationset_p.h
+++ b/src/android/view/animation/qnativeandroidanimationset_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAnimationSet : public QNativeAndroidAnimation
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAnimationSet : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(bool shareInterpolator READ shareInterpolator WRITE setShareInterpolator NOTIFY shareInterpolatorChanged)
diff --git a/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h b/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h
index 5fd0261..9e45caa 100644
--- a/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAnticipateInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAnticipateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
diff --git a/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h
index caef6d6..34b3d15 100644
--- a/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAnticipateOvershootInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAnticipateOvershootInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
diff --git a/src/android/view/animation/qnativeandroidbounceinterpolator_p.h b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
index 9be47bd..675fea9 100644
--- a/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidBounceInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidBounceInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
 
diff --git a/src/android/view/animation/qnativeandroidcycleinterpolator_p.h b/src/android/view/animation/qnativeandroidcycleinterpolator_p.h
index 1d48c74..69b6420 100644
--- a/src/android/view/animation/qnativeandroidcycleinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidcycleinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidCycleInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidCycleInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal cycles READ cycles WRITE setCycles NOTIFY cyclesChanged)
diff --git a/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h
index 5f7b0cb..290bfb1 100644
--- a/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidDecelerateInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidDecelerateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
diff --git a/src/android/view/animation/qnativeandroidinterpolator_p.h b/src/android/view/animation/qnativeandroidinterpolator_p.h
index 6922345..6f541b2 100644
--- a/src/android/view/animation/qnativeandroidinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidinterpolator_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidInterpolator : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidInterpolator : public QNativeAndroidObject
 {
     Q_OBJECT
 
diff --git a/src/android/view/animation/qnativeandroidlinearinterpolator_p.h b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
index 73f3934..6dc2a40 100644
--- a/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidLinearInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidLinearInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
 
diff --git a/src/android/view/animation/qnativeandroidovershootinterpolator_p.h b/src/android/view/animation/qnativeandroidovershootinterpolator_p.h
index bb345b3..a3a7a6a 100644
--- a/src/android/view/animation/qnativeandroidovershootinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidovershootinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidOvershootInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidOvershootInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
diff --git a/src/android/view/animation/qnativeandroidpathinterpolator_p.h b/src/android/view/animation/qnativeandroidpathinterpolator_p.h
index 836a33a..9d9b9e8 100644
--- a/src/android/view/animation/qnativeandroidpathinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidpathinterpolator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidPathInterpolator : public QNativeAndroidInterpolator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidPathInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY controlXChanged)
diff --git a/src/android/view/animation/qnativeandroidrotateanimation_p.h b/src/android/view/animation/qnativeandroidrotateanimation_p.h
index 7e366f9..85eec7b 100644
--- a/src/android/view/animation/qnativeandroidrotateanimation_p.h
+++ b/src/android/view/animation/qnativeandroidrotateanimation_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRotateAnimation : public QNativeAndroidAnimation
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRotateAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromDegrees READ fromDegrees WRITE setFromDegrees NOTIFY fromDegreesChanged)
diff --git a/src/android/view/animation/qnativeandroidscaleanimation_p.h b/src/android/view/animation/qnativeandroidscaleanimation_p.h
index 48e97b9..3c4e925 100644
--- a/src/android/view/animation/qnativeandroidscaleanimation_p.h
+++ b/src/android/view/animation/qnativeandroidscaleanimation_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidScaleAnimation : public QNativeAndroidAnimation
+class Q_NATIVEANDROID_EXPORT QNativeAndroidScaleAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromXScale READ fromXScale WRITE setFromXScale NOTIFY fromXScaleChanged)
diff --git a/src/android/view/animation/qnativeandroidtranslateanimation_p.h b/src/android/view/animation/qnativeandroidtranslateanimation_p.h
index ec89fc5..f00efdd 100644
--- a/src/android/view/animation/qnativeandroidtranslateanimation_p.h
+++ b/src/android/view/animation/qnativeandroidtranslateanimation_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidTranslateAnimation : public QNativeAndroidAnimation
+class Q_NATIVEANDROID_EXPORT QNativeAndroidTranslateAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromX READ fromX WRITE setFromX NOTIFY fromXChanged)
diff --git a/src/android/view/qnativeandroidgravity_p.h b/src/android/view/qnativeandroidgravity_p.h
index 1edfb8c..b0873c6 100644
--- a/src/android/view/qnativeandroidgravity_p.h
+++ b/src/android/view/qnativeandroidgravity_p.h
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidGravity : public QObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidGravity : public QObject
 {
     Q_OBJECT
     Q_FLAGS(Flags)
diff --git a/src/android/view/qnativeandroidlayoutparams_p.h b/src/android/view/qnativeandroidlayoutparams_p.h
index 7da8242..56ee9d1 100644
--- a/src/android/view/qnativeandroidlayoutparams_p.h
+++ b/src/android/view/qnativeandroidlayoutparams_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidLayoutParams : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidLayoutParams : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
diff --git a/src/android/view/qnativeandroidmenu_p.h b/src/android/view/qnativeandroidmenu_p.h
index 8329885..863d2c6 100644
--- a/src/android/view/qnativeandroidmenu_p.h
+++ b/src/android/view/qnativeandroidmenu_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidMenuItem;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidMenu : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidMenu : public QNativeAndroidContextual
 {
     Q_OBJECT
 
diff --git a/src/android/view/qnativeandroidmenuitem_p.h b/src/android/view/qnativeandroidmenuitem_p.h
index 70c84c7..a009fa2 100644
--- a/src/android/view/qnativeandroidmenuitem_p.h
+++ b/src/android/view/qnativeandroidmenuitem_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidMenuItem : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidMenuItem : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
diff --git a/src/android/view/qnativeandroidview_p.h b/src/android/view/qnativeandroidview_p.h
index e906bc9..cde93da 100644
--- a/src/android/view/qnativeandroidview_p.h
+++ b/src/android/view/qnativeandroidview_p.h
@@ -58,7 +58,7 @@ class QNativeAndroidDrawable;
 class QNativeAndroidAnimation;
 class QNativeAndroidLayoutParams;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidView : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidView : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidView *parent READ parentView WRITE setParentView NOTIFY parentChanged)
diff --git a/src/android/view/qnativeandroidviewgroup_p.h b/src/android/view/qnativeandroidviewgroup_p.h
index a906ffc..5345ba4 100644
--- a/src/android/view/qnativeandroidviewgroup_p.h
+++ b/src/android/view/qnativeandroidviewgroup_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidViewGroup : public QNativeAndroidView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidViewGroup : public QNativeAndroidView
 {
     Q_OBJECT
 
diff --git a/src/android/view/qnativeandroidwindow_p.h b/src/android/view/qnativeandroidwindow_p.h
index 5ca7b75..cd4236f 100644
--- a/src/android/view/qnativeandroidwindow_p.h
+++ b/src/android/view/qnativeandroidwindow_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidWindow : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidWindow : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int statusBarColor READ statusBarColor WRITE setStatusBarColor NOTIFY statusBarColorChanged)
diff --git a/src/android/widget/qnativeandroidabsseekbar_p.h b/src/android/widget/qnativeandroidabsseekbar_p.h
index eb57d15..7d4bc47 100644
--- a/src/android/widget/qnativeandroidabsseekbar_p.h
+++ b/src/android/widget/qnativeandroidabsseekbar_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAbsSeekBar : public QNativeAndroidProgressBar
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAbsSeekBar : public QNativeAndroidProgressBar
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidadapterview_p.h b/src/android/widget/qnativeandroidadapterview_p.h
index 2637596..9c57324 100644
--- a/src/android/widget/qnativeandroidadapterview_p.h
+++ b/src/android/widget/qnativeandroidadapterview_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidBaseAdapter;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidAdapterView : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidAdapterView : public QNativeAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter
diff --git a/src/android/widget/qnativeandroidarrayadapter_p.h b/src/android/widget/qnativeandroidarrayadapter_p.h
index b89085b..654c88b 100644
--- a/src/android/widget/qnativeandroidarrayadapter_p.h
+++ b/src/android/widget/qnativeandroidarrayadapter_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidArrayAdapter : public QNativeAndroidBaseAdapter
+class Q_NATIVEANDROID_EXPORT QNativeAndroidArrayAdapter : public QNativeAndroidBaseAdapter
 {
     Q_OBJECT
     Q_PROPERTY(int style READ style WRITE setStyle NOTIFY styleChanged)
diff --git a/src/android/widget/qnativeandroidbaseadapter_p.h b/src/android/widget/qnativeandroidbaseadapter_p.h
index 9bbdf0c..95384a0 100644
--- a/src/android/widget/qnativeandroidbaseadapter_p.h
+++ b/src/android/widget/qnativeandroidbaseadapter_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidBaseAdapter : public QNativeAndroidContextual
+class Q_NATIVEANDROID_EXPORT QNativeAndroidBaseAdapter : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
diff --git a/src/android/widget/qnativeandroidbutton_p.h b/src/android/widget/qnativeandroidbutton_p.h
index 59264e6..11a5a95 100644
--- a/src/android/widget/qnativeandroidbutton_p.h
+++ b/src/android/widget/qnativeandroidbutton_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidButton : public QNativeAndroidTextView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidButton : public QNativeAndroidTextView
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidcalendarview_p.h b/src/android/widget/qnativeandroidcalendarview_p.h
index b6c4276..47835cc 100644
--- a/src/android/widget/qnativeandroidcalendarview_p.h
+++ b/src/android/widget/qnativeandroidcalendarview_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidCalendarView : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidCalendarView : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidcheckbox_p.h b/src/android/widget/qnativeandroidcheckbox_p.h
index fef5619..baf2a02 100644
--- a/src/android/widget/qnativeandroidcheckbox_p.h
+++ b/src/android/widget/qnativeandroidcheckbox_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidCheckBox : public QNativeAndroidCompoundButton
+class Q_NATIVEANDROID_EXPORT QNativeAndroidCheckBox : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidcompoundbutton_p.h b/src/android/widget/qnativeandroidcompoundbutton_p.h
index afac7dd..227f6f2 100644
--- a/src/android/widget/qnativeandroidcompoundbutton_p.h
+++ b/src/android/widget/qnativeandroidcompoundbutton_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidCompoundButton : public QNativeAndroidButton
+class Q_NATIVEANDROID_EXPORT QNativeAndroidCompoundButton : public QNativeAndroidButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged)
diff --git a/src/android/widget/qnativeandroiddatepicker_p.h b/src/android/widget/qnativeandroiddatepicker_p.h
index 5859420..47f25da 100644
--- a/src/android/widget/qnativeandroiddatepicker_p.h
+++ b/src/android/widget/qnativeandroiddatepicker_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidDatePicker : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidDatePicker : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidedittext_p.h b/src/android/widget/qnativeandroidedittext_p.h
index 1dbd6b8..e75b5fe 100644
--- a/src/android/widget/qnativeandroidedittext_p.h
+++ b/src/android/widget/qnativeandroidedittext_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidEditText : public QNativeAndroidTextView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidEditText : public QNativeAndroidTextView
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidframelayout_p.h b/src/android/widget/qnativeandroidframelayout_p.h
index 3d388e2..dd321c9 100644
--- a/src/android/widget/qnativeandroidframelayout_p.h
+++ b/src/android/widget/qnativeandroidframelayout_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidFrameLayout : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidFrameLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidframelayoutparams_p.h b/src/android/widget/qnativeandroidframelayoutparams_p.h
index 854fae3..7302ba2 100644
--- a/src/android/widget/qnativeandroidframelayoutparams_p.h
+++ b/src/android/widget/qnativeandroidframelayoutparams_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidFrameLayoutParams : public QNativeAndroidMarginLayoutParams
+class Q_NATIVEANDROID_EXPORT QNativeAndroidFrameLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
diff --git a/src/android/widget/qnativeandroidimageview_p.h b/src/android/widget/qnativeandroidimageview_p.h
index c4e00e9..4b097fe 100644
--- a/src/android/widget/qnativeandroidimageview_p.h
+++ b/src/android/widget/qnativeandroidimageview_p.h
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidImageView : public QNativeAndroidView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidImageView : public QNativeAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(QUrl imageURI READ imageURI WRITE setImageURI NOTIFY imageURIChanged)
diff --git a/src/android/widget/qnativeandroidlinearlayout_p.h b/src/android/widget/qnativeandroidlinearlayout_p.h
index 20185b9..ce63d4b 100644
--- a/src/android/widget/qnativeandroidlinearlayout_p.h
+++ b/src/android/widget/qnativeandroidlinearlayout_p.h
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidLinearLayout : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidLinearLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(bool baselineAligned READ isBaselineAligned WRITE setBaselineAligned NOTIFY baselineAlignedChanged)
diff --git a/src/android/widget/qnativeandroidlinearlayoutparams_p.h b/src/android/widget/qnativeandroidlinearlayoutparams_p.h
index 35a9091..a9e4d6e 100644
--- a/src/android/widget/qnativeandroidlinearlayoutparams_p.h
+++ b/src/android/widget/qnativeandroidlinearlayoutparams_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidLinearLayoutParams : public QNativeAndroidMarginLayoutParams
+class Q_NATIVEANDROID_EXPORT QNativeAndroidLinearLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
diff --git a/src/android/widget/qnativeandroidlistview_p.h b/src/android/widget/qnativeandroidlistview_p.h
index b7f4f04..9376283 100644
--- a/src/android/widget/qnativeandroidlistview_p.h
+++ b/src/android/widget/qnativeandroidlistview_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidListView : public QNativeAndroidAdapterView // TODO: AbsListView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidListView : public QNativeAndroidAdapterView // TODO: AbsListView
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidmarginlayoutparams_p.h b/src/android/widget/qnativeandroidmarginlayoutparams_p.h
index 5392f7a..62a6ffd 100644
--- a/src/android/widget/qnativeandroidmarginlayoutparams_p.h
+++ b/src/android/widget/qnativeandroidmarginlayoutparams_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidMarginLayoutParams : public QNativeAndroidLayoutParams
+class Q_NATIVEANDROID_EXPORT QNativeAndroidMarginLayoutParams : public QNativeAndroidLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int margin READ margin WRITE setMargin NOTIFY marginChanged)
diff --git a/src/android/widget/qnativeandroidnumberpicker_p.h b/src/android/widget/qnativeandroidnumberpicker_p.h
index afb946f..550461a 100644
--- a/src/android/widget/qnativeandroidnumberpicker_p.h
+++ b/src/android/widget/qnativeandroidnumberpicker_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidNumberPicker : public QNativeAndroidLinearLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidNumberPicker : public QNativeAndroidLinearLayout
 {
     Q_OBJECT
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
diff --git a/src/android/widget/qnativeandroidpopupmenu_p.h b/src/android/widget/qnativeandroidpopupmenu_p.h
index dc326d5..608d028 100644
--- a/src/android/widget/qnativeandroidpopupmenu_p.h
+++ b/src/android/widget/qnativeandroidpopupmenu_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 class QNativeAndroidView;
 class QNativeAndroidMenuItem;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidPopupMenu : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidPopupMenu : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidView *anchor READ anchor WRITE setAnchor NOTIFY anchorChanged)
diff --git a/src/android/widget/qnativeandroidprogressbar_p.h b/src/android/widget/qnativeandroidprogressbar_p.h
index a7328de..2ef99a5 100644
--- a/src/android/widget/qnativeandroidprogressbar_p.h
+++ b/src/android/widget/qnativeandroidprogressbar_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidProgressBar : public QNativeAndroidView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidProgressBar : public QNativeAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate NOTIFY indeterminateChanged)
diff --git a/src/android/widget/qnativeandroidradiobutton_p.h b/src/android/widget/qnativeandroidradiobutton_p.h
index b0ce177..11c15f2 100644
--- a/src/android/widget/qnativeandroidradiobutton_p.h
+++ b/src/android/widget/qnativeandroidradiobutton_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRadioButton : public QNativeAndroidCompoundButton
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRadioButton : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidradiogroup_p.h b/src/android/widget/qnativeandroidradiogroup_p.h
index 498239c..df67864 100644
--- a/src/android/widget/qnativeandroidradiogroup_p.h
+++ b/src/android/widget/qnativeandroidradiogroup_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidRadioButton;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRadioGroup : public QNativeAndroidLinearLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRadioGroup : public QNativeAndroidLinearLayout
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
diff --git a/src/android/widget/qnativeandroidratingbar_p.h b/src/android/widget/qnativeandroidratingbar_p.h
index 479b17e..35ba5a5 100644
--- a/src/android/widget/qnativeandroidratingbar_p.h
+++ b/src/android/widget/qnativeandroidratingbar_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRatingBar : public QNativeAndroidAbsSeekBar
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRatingBar : public QNativeAndroidAbsSeekBar
 {
     Q_OBJECT
     Q_PROPERTY(qreal rating READ rating WRITE setRating NOTIFY ratingChanged)
diff --git a/src/android/widget/qnativeandroidrelativelayout_p.h b/src/android/widget/qnativeandroidrelativelayout_p.h
index c867120..e0aa8db 100644
--- a/src/android/widget/qnativeandroidrelativelayout_p.h
+++ b/src/android/widget/qnativeandroidrelativelayout_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRelativeLayout : public QNativeAndroidViewGroup
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRelativeLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidrelativelayoutparams_p.h b/src/android/widget/qnativeandroidrelativelayoutparams_p.h
index 0677486..29a5bba 100644
--- a/src/android/widget/qnativeandroidrelativelayoutparams_p.h
+++ b/src/android/widget/qnativeandroidrelativelayoutparams_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidRelativeLayoutParams : public QNativeAndroidMarginLayoutParams
+class Q_NATIVEANDROID_EXPORT QNativeAndroidRelativeLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(QNativeAndroidView *above READ above WRITE setAbove NOTIFY aboveChanged)
diff --git a/src/android/widget/qnativeandroidscrollview_p.h b/src/android/widget/qnativeandroidscrollview_p.h
index dbbc7f2..97bc668 100644
--- a/src/android/widget/qnativeandroidscrollview_p.h
+++ b/src/android/widget/qnativeandroidscrollview_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidScrollView : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidScrollView : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
     Q_PROPERTY(int scrollX READ scrollX WRITE setScrollX NOTIFY scrollXChanged)
diff --git a/src/android/widget/qnativeandroidsearchview_p.h b/src/android/widget/qnativeandroidsearchview_p.h
index eccc647..7c24c92 100644
--- a/src/android/widget/qnativeandroidsearchview_p.h
+++ b/src/android/widget/qnativeandroidsearchview_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidSearchView : public QNativeAndroidLinearLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidSearchView : public QNativeAndroidLinearLayout
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidseekbar_p.h b/src/android/widget/qnativeandroidseekbar_p.h
index 731c7ff..a54eaf0 100644
--- a/src/android/widget/qnativeandroidseekbar_p.h
+++ b/src/android/widget/qnativeandroidseekbar_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidSeekBar : public QNativeAndroidAbsSeekBar
+class Q_NATIVEANDROID_EXPORT QNativeAndroidSeekBar : public QNativeAndroidAbsSeekBar
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidspace_p.h b/src/android/widget/qnativeandroidspace_p.h
index c2604e2..50cffec 100644
--- a/src/android/widget/qnativeandroidspace_p.h
+++ b/src/android/widget/qnativeandroidspace_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidSpace : public QNativeAndroidView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidSpace : public QNativeAndroidView
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidspinner_p.h b/src/android/widget/qnativeandroidspinner_p.h
index 5681733..f681d99 100644
--- a/src/android/widget/qnativeandroidspinner_p.h
+++ b/src/android/widget/qnativeandroidspinner_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidSpinner : public QNativeAndroidAdapterView // TODO: AbsSpinner
+class Q_NATIVEANDROID_EXPORT QNativeAndroidSpinner : public QNativeAndroidAdapterView // TODO: AbsSpinner
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidswitch_p.h b/src/android/widget/qnativeandroidswitch_p.h
index 93fefb8..5f7928f 100644
--- a/src/android/widget/qnativeandroidswitch_p.h
+++ b/src/android/widget/qnativeandroidswitch_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidSwitch : public QNativeAndroidCompoundButton
+class Q_NATIVEANDROID_EXPORT QNativeAndroidSwitch : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidtabhost_p.h b/src/android/widget/qnativeandroidtabhost_p.h
index a21f4a5..ee98dbe 100644
--- a/src/android/widget/qnativeandroidtabhost_p.h
+++ b/src/android/widget/qnativeandroidtabhost_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidTabHost : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidTabHost : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidtabspec_p.h b/src/android/widget/qnativeandroidtabspec_p.h
index 11e01b8..fdaebf1 100644
--- a/src/android/widget/qnativeandroidtabspec_p.h
+++ b/src/android/widget/qnativeandroidtabspec_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QNativeAndroidView;
 class QNativeAndroidTabHost;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidTabSpec : public QObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidTabSpec : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
diff --git a/src/android/widget/qnativeandroidtabwidget_p.h b/src/android/widget/qnativeandroidtabwidget_p.h
index 5b158e5..b0f429f 100644
--- a/src/android/widget/qnativeandroidtabwidget_p.h
+++ b/src/android/widget/qnativeandroidtabwidget_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidTabWidget : public QNativeAndroidLinearLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidTabWidget : public QNativeAndroidLinearLayout
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidtextview_p.h b/src/android/widget/qnativeandroidtextview_p.h
index a360f42..c5089a5 100644
--- a/src/android/widget/qnativeandroidtextview_p.h
+++ b/src/android/widget/qnativeandroidtextview_p.h
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidTextView : public QNativeAndroidView
+class Q_NATIVEANDROID_EXPORT QNativeAndroidTextView : public QNativeAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
diff --git a/src/android/widget/qnativeandroidtimepicker_p.h b/src/android/widget/qnativeandroidtimepicker_p.h
index 539b426..10798a7 100644
--- a/src/android/widget/qnativeandroidtimepicker_p.h
+++ b/src/android/widget/qnativeandroidtimepicker_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidTimePicker : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidTimePicker : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidtoast_p.h b/src/android/widget/qnativeandroidtoast_p.h
index aa3baf8..c9037cf 100644
--- a/src/android/widget/qnativeandroidtoast_p.h
+++ b/src/android/widget/qnativeandroidtoast_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QNativeAndroidToast : public QNativeAndroidObject
+class Q_NATIVEANDROID_EXPORT QNativeAndroidToast : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
diff --git a/src/android/widget/qnativeandroidtogglebutton_p.h b/src/android/widget/qnativeandroidtogglebutton_p.h
index 6e5741f..ad91ccd 100644
--- a/src/android/widget/qnativeandroidtogglebutton_p.h
+++ b/src/android/widget/qnativeandroidtogglebutton_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidToggleButton : public QNativeAndroidCompoundButton
+class Q_NATIVEANDROID_EXPORT QNativeAndroidToggleButton : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
     Q_PROPERTY(QString textOn READ textOn WRITE setTextOn NOTIFY textOnChanged)
diff --git a/src/android/widget/qnativeandroidviewanimator_p.h b/src/android/widget/qnativeandroidviewanimator_p.h
index f55f392..3bd250e 100644
--- a/src/android/widget/qnativeandroidviewanimator_p.h
+++ b/src/android/widget/qnativeandroidviewanimator_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidViewAnimator : public QNativeAndroidFrameLayout
+class Q_NATIVEANDROID_EXPORT QNativeAndroidViewAnimator : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
     Q_PROPERTY(int displayedChild READ displayedChild WRITE setDisplayedChild NOTIFY displayedChildChanged)
diff --git a/src/android/widget/qnativeandroidviewflipper_p.h b/src/android/widget/qnativeandroidviewflipper_p.h
index 2d1b43b..6f32491 100644
--- a/src/android/widget/qnativeandroidviewflipper_p.h
+++ b/src/android/widget/qnativeandroidviewflipper_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidViewFlipper : public QNativeAndroidViewAnimator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidViewFlipper : public QNativeAndroidViewAnimator
 {
     Q_OBJECT
 
diff --git a/src/android/widget/qnativeandroidviewswitcher_p.h b/src/android/widget/qnativeandroidviewswitcher_p.h
index b9b9c92..14e9d65 100644
--- a/src/android/widget/qnativeandroidviewswitcher_p.h
+++ b/src/android/widget/qnativeandroidviewswitcher_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QNativeAndroidViewSwitcher : public QNativeAndroidViewAnimator
+class Q_NATIVEANDROID_EXPORT QNativeAndroidViewSwitcher : public QNativeAndroidViewAnimator
 {
     Q_OBJECT