namespace QtQmlAndroid -> QtNativeAndroid

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

33 files changed, 117 insertions, 117 deletions

diff --git a/src/android/app/qnativeandroidactionbar.cpp b/src/android/app/qnativeandroidactionbar.cpp
index 7bee021..7a22f8f 100644
--- a/src/android/app/qnativeandroidactionbar.cpp
+++ b/src/android/app/qnativeandroidactionbar.cpp
@@ -55,9 +55,9 @@ void QNativeAndroidActionBar::setVisible(bool arg)
     if (arg != isVisible()) {
         m_visible = arg;
         if (arg)
-            QtQmlAndroid::callVoidMethod(instance(), "show");
+            QtNativeAndroid::callVoidMethod(instance(), "show");
         else
-            QtQmlAndroid::callVoidMethod(instance(), "hide");
+            QtNativeAndroid::callVoidMethod(instance(), "hide");
         emit visibleChanged();
     }
 }
@@ -71,7 +71,7 @@ void QNativeAndroidActionBar::setElevation(qreal elevation)
 {
     if (m_elevation != elevation) {
         m_elevation = elevation;
-        QtQmlAndroid::callRealMethod(instance(), "setElevation", elevation);
+        QtNativeAndroid::callRealMethod(instance(), "setElevation", elevation);
         emit elevationChanged();
     }
 }
@@ -85,7 +85,7 @@ void QNativeAndroidActionBar::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
-        QtQmlAndroid::callTextMethod(instance(), "setTitle", title);
+        QtNativeAndroid::callTextMethod(instance(), "setTitle", title);
         emit titleChanged();
     }
 }
@@ -99,7 +99,7 @@ void QNativeAndroidActionBar::setSubtitle(const QString &subtitle)
 {
     if (m_subtitle != subtitle) {
         m_subtitle = subtitle;
-        QtQmlAndroid::callTextMethod(instance(), "setSubtitle", subtitle);
+        QtNativeAndroid::callTextMethod(instance(), "setSubtitle", subtitle);
         emit subtitleChanged();
     }
 }
@@ -154,7 +154,7 @@ void QNativeAndroidActionBar::updateBackground()
 
     QAndroidJniObject bar = instance();
     QAndroidJniObject background = m_background->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         bar.callMethod<void>("setBackgroundDrawable", "(Landroid/graphics/drawable/Drawable;)V", background.object());
     });
 }
diff --git a/src/android/app/qnativeandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp
index 840cf0d..90f92cc 100644
--- a/src/android/app/qnativeandroidactivity.cpp
+++ b/src/android/app/qnativeandroidactivity.cpp
@@ -150,7 +150,7 @@ void QNativeAndroidActivity::setupWindow()
         return;
 
     QAndroidJniObject activity = instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject wnd = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
         m_window->inflate(wnd);
     });
@@ -162,7 +162,7 @@ void QNativeAndroidActivity::setupActionBar()
         return;
 
     QAndroidJniObject activity = instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject bar = activity.callObjectMethod("getActionBar", "()Landroid/app/ActionBar;");
         m_actionBar->inflate(bar);
     });
@@ -178,14 +178,14 @@ void QNativeAndroidActivity::updateOptionsMenu()
         menu = m_optionsMenu->instance();
 
     QAndroidJniObject activity = instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         activity.callMethod<void>("setOptionsMenu", "(Lorg/qtproject/qt5/android/bindings/view/QtNativeMenu;)V", menu.object());
     });
 }
 
 void QNativeAndroidActivity::invalidateOptionsMenu()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "invalidateOptionsMenu");
+    QtNativeAndroid::callVoidMethod(instance(), "invalidateOptionsMenu");
 }
 
 void QNativeAndroidActivity::updateContentView()
@@ -198,7 +198,7 @@ void QNativeAndroidActivity::updateContentView()
         content = m_contentView->instance();
 
     QAndroidJniObject activity = instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         activity.callMethod<void>("setContentView", "(Landroid/view/View;)V", content.object());
     });
 }
diff --git a/src/android/app/qnativeandroidalertdialog.cpp b/src/android/app/qnativeandroidalertdialog.cpp
index 0b89c4f..3a326b7 100644
--- a/src/android/app/qnativeandroidalertdialog.cpp
+++ b/src/android/app/qnativeandroidalertdialog.cpp
@@ -53,7 +53,7 @@ void QNativeAndroidAlertDialog::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
-        QtQmlAndroid::callTextMethod(instance(), "setTitle", title);
+        QtNativeAndroid::callTextMethod(instance(), "setTitle", title);
         emit titleChanged();
     }
 }
@@ -67,7 +67,7 @@ void QNativeAndroidAlertDialog::setMessage(const QString &message)
 {
     if (m_message != message) {
         m_message = message;
-        QtQmlAndroid::callTextMethod(instance(), "setMessage", message);
+        QtNativeAndroid::callTextMethod(instance(), "setMessage", message);
         emit messageChanged();
     }
 }
diff --git a/src/android/app/qnativeandroiddialog.cpp b/src/android/app/qnativeandroiddialog.cpp
index 04ee54a..065b217 100644
--- a/src/android/app/qnativeandroiddialog.cpp
+++ b/src/android/app/qnativeandroiddialog.cpp
@@ -46,22 +46,22 @@ QNativeAndroidDialog::QNativeAndroidDialog(QObject *parent) :
 
 void QNativeAndroidDialog::cancel()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "cancel");
+    QtNativeAndroid::callVoidMethod(instance(), "cancel");
 }
 
 void QNativeAndroidDialog::dismiss()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "dismiss");
+    QtNativeAndroid::callVoidMethod(instance(), "dismiss");
 }
 
 void QNativeAndroidDialog::hide()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "hide");
+    QtNativeAndroid::callVoidMethod(instance(), "hide");
 }
 
 void QNativeAndroidDialog::show()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "show");
+    QtNativeAndroid::callVoidMethod(instance(), "show");
 }
 
 QAndroidJniObject QNativeAndroidDialog::onCreate()
diff --git a/src/android/app/qnativeandroidservice.cpp b/src/android/app/qnativeandroidservice.cpp
index 46f726a..770bdb7 100644
--- a/src/android/app/qnativeandroidservice.cpp
+++ b/src/android/app/qnativeandroidservice.cpp
@@ -65,7 +65,7 @@ void QNativeAndroidService::start()
     if (!context.isValid() || !service.isValid())
         return; // TODO: warn
 
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject cls = service.callObjectMethod("getClass", "()Ljava/lang/Class;");
         QAndroidJniObject intent = QAndroidJniObject("android/content/Intent",
                                                      "(Landroid/content/Context;Ljava/lang/Class;)V",
@@ -90,7 +90,7 @@ void QNativeAndroidService::stop()
     if (!context.isValid() || !service.isValid())
         return; // TODO: warn
 
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject cls = service.callObjectMethod("getClass", "()Ljava/lang/Class;");
         QAndroidJniObject intent = QAndroidJniObject("android/content/Intent",
                                                      "(Landroid/content/Context;Ljava/lang/Class;)V",
diff --git a/src/android/core/qnativeandroidobject.cpp b/src/android/core/qnativeandroidobject.cpp
index d481e03..57dcaf8 100644
--- a/src/android/core/qnativeandroidobject.cpp
+++ b/src/android/core/qnativeandroidobject.cpp
@@ -72,7 +72,7 @@ void QNativeAndroidObject::setInstance(const QAndroidJniObject &instance)
 
 void QNativeAndroidObject::changeInstance()
 {
-    Q_ASSERT(QtQmlAndroid::isMainQtThread());
+    Q_ASSERT(QtNativeAndroid::isMainQtThread());
     objectChange(InstanceChange);
     emit instanceChanged();
 }
@@ -89,8 +89,8 @@ void QNativeAndroidObject::construct()
         inflate(onCreate());
     };
 
-    if (QtQmlAndroid::isMainQtThread())
-        QtQmlAndroid::callFunction(method);
+    if (QtNativeAndroid::isMainQtThread())
+        QtNativeAndroid::callFunction(method);
     else
         method();
 }
@@ -104,8 +104,8 @@ void QNativeAndroidObject::inflate(const QAndroidJniObject &instance)
         setInstance(object);
     };
 
-    if (QtQmlAndroid::isMainQtThread())
-        QtQmlAndroid::callFunction(method);
+    if (QtNativeAndroid::isMainQtThread())
+        QtNativeAndroid::callFunction(method);
     else
         method();
 }
@@ -129,7 +129,7 @@ QAndroidJniObject QNativeAndroidObject::onCreate()
 void QNativeAndroidObject::onInflate(QAndroidJniObject &instance)
 {
     Q_UNUSED(instance);
-    Q_ASSERT(!QtQmlAndroid::isMainQtThread());
+    Q_ASSERT(!QtNativeAndroid::isMainQtThread());
 }
 
 bool QNativeAndroidObject::isComponentComplete() const
@@ -148,7 +148,7 @@ void QNativeAndroidObject::componentComplete()
 
 void QNativeAndroidObject::objectChange(ObjectChange change)
 {
-    Q_ASSERT(QtQmlAndroid::isMainQtThread());
+    Q_ASSERT(QtNativeAndroid::isMainQtThread());
     Q_UNUSED(change);
 }
 
diff --git a/src/android/core/qtnativeandroidfunctions.cpp b/src/android/core/qtnativeandroidfunctions.cpp
index 5c7ab5b..1928c60 100644
--- a/src/android/core/qtnativeandroidfunctions.cpp
+++ b/src/android/core/qtnativeandroidfunctions.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtQmlAndroid {
+namespace QtNativeAndroid {
 
 void callFunction(std::function<void()> method)
 {
diff --git a/src/android/core/qtnativeandroidfunctions_p.h b/src/android/core/qtnativeandroidfunctions_p.h
index 07d89ff..ce74b11 100644
--- a/src/android/core/qtnativeandroidfunctions_p.h
+++ b/src/android/core/qtnativeandroidfunctions_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 class QString;
 class QAndroidJniObject;
 
-namespace QtQmlAndroid
+namespace QtNativeAndroid
 {
     void callFunction(std::function<void()> method);
     void callTextMethod(const QAndroidJniObject &obj, const char *method, const QString &text);
diff --git a/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp b/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
index 7fb9108..9b3d93a 100644
--- a/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
+++ b/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
@@ -58,7 +58,7 @@ void QNativeAndroidColorDrawable::setColor(int color)
 {
     if (m_color != color) {
         m_color = color;
-        QtQmlAndroid::callIntMethod(instance(), "setColor", color);
+        QtNativeAndroid::callIntMethod(instance(), "setColor", color);
         emit colorChanged();
     }
 }
diff --git a/src/android/qtnativeandroidglobal_p.h b/src/android/qtnativeandroidglobal_p.h
index 03389e2..abb251f 100644
--- a/src/android/qtnativeandroidglobal_p.h
+++ b/src/android/qtnativeandroidglobal_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 #  define Q_QMLANDROID_EXPORT
 #endif
 
-namespace QtQmlAndroid {
+namespace QtNativeAndroid {
     static inline bool isMainQtThread()
     {
         return QThread::currentThread() == qApp->thread();
diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
index 5a0394c..d0f35c3 100644
--- a/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
@@ -55,12 +55,12 @@ QNativeAndroidDrawerLayoutParams *QNativeAndroidDrawerLayout::qmlAttachedPropert
 
 void QNativeAndroidDrawerLayout::closeDrawers()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "closeDrawers");
+    QtNativeAndroid::callVoidMethod(instance(), "closeDrawers");
 }
 
 void QNativeAndroidDrawerLayout::closeDrawer(int gravity)
 {
-    QtQmlAndroid::callIntMethod(instance(), "closeDrawer", gravity);
+    QtNativeAndroid::callIntMethod(instance(), "closeDrawer", gravity);
 }
 
 QAndroidJniObject QNativeAndroidDrawerLayout::onCreate()
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
index f7fbe7d..26f376d 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
@@ -52,7 +52,7 @@ bool QNativeAndroidSwipeRefreshLayout::isRefreshing() const
 void QNativeAndroidSwipeRefreshLayout::setRefreshing(bool refreshing)
 {
     if (updateRefreshing(refreshing))
-        QtQmlAndroid::callBoolMethod(instance(), "setRefreshing", refreshing);
+        QtNativeAndroid::callBoolMethod(instance(), "setRefreshing", refreshing);
 }
 
 bool QNativeAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
diff --git a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
index 426074a..bf2e2b8 100644
--- a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
@@ -56,7 +56,7 @@ void QNativeAndroidRecyclerAdapter::setCount(int count)
 {
     if (m_count != count) {
         m_count = count;
-        QtQmlAndroid::callIntMethod(instance(), "setItemCount", count);
+        QtNativeAndroid::callIntMethod(instance(), "setItemCount", count);
         emit countChanged();
     }
 }
@@ -70,7 +70,7 @@ void QNativeAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
 {
     if (m_delegate != delegate) {
         m_delegate = delegate;
-        QtQmlAndroid::callVoidMethod(instance(), "notifyDataSetChanged");
+        QtNativeAndroid::callVoidMethod(instance(), "notifyDataSetChanged");
         emit delegateChanged();
     }
 }
diff --git a/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
index 27b8d0e..4f38fcf 100644
--- a/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
@@ -102,7 +102,7 @@ void QNativeAndroidRecyclerView::updateAdapter()
 
     QAndroidJniObject view = instance();
     QAndroidJniObject adapter = m_adapter->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         view.callMethod<void>("setAdapter", "(Landroid/support/v7/widget/RecyclerView$Adapter;)V", adapter.object());
     });
 }
diff --git a/src/android/view/animation/qnativeandroidanimation.cpp b/src/android/view/animation/qnativeandroidanimation.cpp
index 5ab832a..f8c94dc 100644
--- a/src/android/view/animation/qnativeandroidanimation.cpp
+++ b/src/android/view/animation/qnativeandroidanimation.cpp
@@ -71,7 +71,7 @@ void QNativeAndroidAnimation::setDuration(int duration)
 {
     if (m_duration.isNull() || m_duration != duration) {
         m_duration = duration;
-        QtQmlAndroid::callIntMethod(instance(), "setDuration", duration);
+        QtNativeAndroid::callIntMethod(instance(), "setDuration", duration);
         emit durationChanged();
     }
 }
@@ -87,7 +87,7 @@ void QNativeAndroidAnimation::setFillAfter(bool fill)
 {
     if (m_fillAfter.isNull() || m_fillAfter != fill) {
         m_fillAfter = fill;
-        QtQmlAndroid::callBoolMethod(instance(), "setFillAfter", fill);
+        QtNativeAndroid::callBoolMethod(instance(), "setFillAfter", fill);
         emit fillAfterChanged();
     }
 }
@@ -103,7 +103,7 @@ void QNativeAndroidAnimation::setFillBefore(bool fill)
 {
     if (m_fillBefore.isNull() || m_fillBefore != fill) {
         m_fillBefore = fill;
-        QtQmlAndroid::callBoolMethod(instance(), "setFillBefore", fill);
+        QtNativeAndroid::callBoolMethod(instance(), "setFillBefore", fill);
         emit fillBeforeChanged();
     }
 }
@@ -119,7 +119,7 @@ void QNativeAndroidAnimation::setFillEnabled(bool fill)
 {
     if (m_fillEnabled.isNull() || m_fillEnabled != fill) {
         m_fillEnabled = fill;
-        QtQmlAndroid::callBoolMethod(instance(), "setFillEnabled", fill);
+        QtNativeAndroid::callBoolMethod(instance(), "setFillEnabled", fill);
         emit fillEnabledChanged();
     }
 }
@@ -156,7 +156,7 @@ void QNativeAndroidAnimation::setRepeatCount(int count)
 {
     if (m_repeatCount.isNull() || m_repeatCount != count) {
         m_repeatCount = count;
-        QtQmlAndroid::callIntMethod(instance(), "setRepeatCount", count);
+        QtNativeAndroid::callIntMethod(instance(), "setRepeatCount", count);
         emit repeatCountChanged();
     }
 }
@@ -172,7 +172,7 @@ void QNativeAndroidAnimation::setRepeatMode(RepeatMode mode)
 {
     if (m_repeatMode.isNull() || m_repeatMode != mode) {
         m_repeatMode = mode;
-        QtQmlAndroid::callIntMethod(instance(), "setRepeatMode", mode);
+        QtNativeAndroid::callIntMethod(instance(), "setRepeatMode", mode);
         emit repeatModeChanged();
     }
 }
@@ -188,7 +188,7 @@ void QNativeAndroidAnimation::setStartOffset(int offset)
 {
     if (m_startOffset.isNull() || m_startOffset != offset) {
         m_startOffset = offset;
-        QtQmlAndroid::callIntMethod(instance(), "setStartOffset", offset);
+        QtNativeAndroid::callIntMethod(instance(), "setStartOffset", offset);
         emit startOffsetChanged();
     }
 }
@@ -204,24 +204,24 @@ void QNativeAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
 {
     if (m_zAdjustment.isNull() || m_zAdjustment != adjustment) {
         m_zAdjustment = adjustment;
-        QtQmlAndroid::callIntMethod(instance(), "setZAdjustment", adjustment);
+        QtNativeAndroid::callIntMethod(instance(), "setZAdjustment", adjustment);
         emit zAdjustmentChanged();
     }
 }
 
 void QNativeAndroidAnimation::cancel()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "cancel");
+    QtNativeAndroid::callVoidMethod(instance(), "cancel");
 }
 
 void QNativeAndroidAnimation::start()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "start");
+    QtNativeAndroid::callVoidMethod(instance(), "start");
 }
 
 void QNativeAndroidAnimation::startNow()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "startNow");
+    QtNativeAndroid::callVoidMethod(instance(), "startNow");
 }
 
 QAndroidJniObject QNativeAndroidAnimation::onCreate()
@@ -273,7 +273,7 @@ void QNativeAndroidAnimation::updateInterpolator()
 
     QAndroidJniObject animation = instance();
     QAndroidJniObject interpolator = m_interpolator->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         animation.callMethod<void>("setInterpolator", "(Landroid/view/animation/Interpolator;)V", interpolator.object());
     });
 }
diff --git a/src/android/view/qnativeandroidmenuitem.cpp b/src/android/view/qnativeandroidmenuitem.cpp
index 23e6fac..75da1aa 100644
--- a/src/android/view/qnativeandroidmenuitem.cpp
+++ b/src/android/view/qnativeandroidmenuitem.cpp
@@ -58,7 +58,7 @@ void QNativeAndroidMenuItem::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
-        QtQmlAndroid::callTextMethod(instance(), "setTitle", title);
+        QtNativeAndroid::callTextMethod(instance(), "setTitle", title);
         emit titleChanged();
     }
 }
@@ -72,7 +72,7 @@ void QNativeAndroidMenuItem::setEnabled(bool enabled)
 {
     if (m_enabled != enabled) {
         m_enabled = enabled;
-        QtQmlAndroid::callBoolMethod(instance(), "setEnabled", enabled);
+        QtNativeAndroid::callBoolMethod(instance(), "setEnabled", enabled);
         emit enabledChanged();
     }
 }
@@ -86,7 +86,7 @@ void QNativeAndroidMenuItem::setVisible(bool visible)
 {
     if (m_visible != visible) {
         m_visible = visible;
-        QtQmlAndroid::callBoolMethod(instance(), "setVisible", visible);
+        QtNativeAndroid::callBoolMethod(instance(), "setVisible", visible);
         if (isValid() && context())
             QMetaObject::invokeMethod(context(), "invalidateOptionsMenu");
         emit visibleChanged();
@@ -102,7 +102,7 @@ void QNativeAndroidMenuItem::setCheckable(bool checkable)
 {
     if (m_checkable != checkable) {
         m_checkable = checkable;
-        QtQmlAndroid::callBoolMethod(instance(), "setCheckable", checkable);
+        QtNativeAndroid::callBoolMethod(instance(), "setCheckable", checkable);
         emit checkableChanged();
     }
 }
@@ -116,7 +116,7 @@ void QNativeAndroidMenuItem::setChecked(bool checked)
 {
     if (m_checked != checked) {
         m_checked = checked;
-        QtQmlAndroid::callBoolMethod(instance(), "setChecked", checked);
+        QtNativeAndroid::callBoolMethod(instance(), "setChecked", checked);
         emit checkedChanged();
     }
 }
@@ -130,7 +130,7 @@ void QNativeAndroidMenuItem::setShowAs(int showAs)
 {
     if (m_showAs != showAs) {
         m_showAs = showAs;
-        QtQmlAndroid::callIntMethod(instance(), "setShowAs", showAs);
+        QtNativeAndroid::callIntMethod(instance(), "setShowAs", showAs);
         emit showAsChanged();
     }
 }
@@ -243,7 +243,7 @@ void QNativeAndroidMenuItem::updateActionView()
 
     QAndroidJniObject item = instance();
     QAndroidJniObject view = m_actionView->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         item.callMethod<void>("setActionView", "(Landroid/view/View;)V", view.object());
     });
 }
diff --git a/src/android/view/qnativeandroidview.cpp b/src/android/view/qnativeandroidview.cpp
index fd07d76..8b8d223 100644
--- a/src/android/view/qnativeandroidview.cpp
+++ b/src/android/view/qnativeandroidview.cpp
@@ -210,7 +210,7 @@ void QNativeAndroidView::setVisible(bool visible)
     if (m_visible != visible) {
         m_visible = visible;
         // TODO: VISIBLE(0), INVISIBLE(4), GONE(8)
-        QtQmlAndroid::callIntMethod(instance(), "setVisibility", visible ? 0 : 4);
+        QtNativeAndroid::callIntMethod(instance(), "setVisibility", visible ? 0 : 4);
         emit visibleChanged();
     }
 }
@@ -273,7 +273,7 @@ void QNativeAndroidView::setTop(int top)
 {
     if (m_top.isNull() || m_top != top) {
         m_top = top;
-        QtQmlAndroid::callIntMethod(instance(), "setTop", top);
+        QtNativeAndroid::callIntMethod(instance(), "setTop", top);
         emit topChanged();
         emit yChanged();
     }
@@ -290,7 +290,7 @@ void QNativeAndroidView::setLeft(int left)
 {
     if (m_left.isNull() || m_left != left) {
         m_left = left;
-        QtQmlAndroid::callIntMethod(instance(), "setLeft", left);
+        QtNativeAndroid::callIntMethod(instance(), "setLeft", left);
         emit leftChanged();
         emit xChanged();
     }
@@ -307,7 +307,7 @@ void QNativeAndroidView::setRight(int right)
 {
     if (m_right.isNull() || m_right != right) {
         m_right = right;
-        QtQmlAndroid::callIntMethod(instance(), "setRight", right);
+        QtNativeAndroid::callIntMethod(instance(), "setRight", right);
         emit rightChanged();
     }
 }
@@ -323,7 +323,7 @@ void QNativeAndroidView::setBottom(int bottom)
 {
     if (m_bottom.isNull() || m_bottom != bottom) {
         m_bottom = bottom;
-        QtQmlAndroid::callIntMethod(instance(), "setBottom", bottom);
+        QtNativeAndroid::callIntMethod(instance(), "setBottom", bottom);
         emit bottomChanged();
     }
 }
@@ -458,7 +458,7 @@ void QNativeAndroidView::setAlpha(qreal alpha)
 {
     if (m_alpha.isNull() || m_alpha != alpha) {
         m_alpha = alpha;
-        QtQmlAndroid::callRealMethod(instance(), "setAlpha", alpha);
+        QtNativeAndroid::callRealMethod(instance(), "setAlpha", alpha);
         emit alphaChanged();
     }
 }
@@ -474,7 +474,7 @@ void QNativeAndroidView::setScaleX(qreal scaleX)
 {
     if (m_scaleX.isNull() || m_scaleX != scaleX) {
         m_scaleX = scaleX;
-        QtQmlAndroid::callRealMethod(instance(), "setScaleX", scaleX);
+        QtNativeAndroid::callRealMethod(instance(), "setScaleX", scaleX);
         emit scaleXChanged();
     }
 }
@@ -490,7 +490,7 @@ void QNativeAndroidView::setScaleY(qreal scaleY)
 {
     if (m_scaleY.isNull() || m_scaleY != scaleY) {
         m_scaleY = scaleY;
-        QtQmlAndroid::callRealMethod(instance(), "setScaleY", scaleY);
+        QtNativeAndroid::callRealMethod(instance(), "setScaleY", scaleY);
         emit scaleYChanged();
     }
 }
@@ -506,7 +506,7 @@ void QNativeAndroidView::setPivotX(qreal pivotX)
 {
     if (m_pivotX.isNull() || m_pivotX != pivotX) {
         m_pivotX = pivotX;
-        QtQmlAndroid::callRealMethod(instance(), "setPivotX", pivotX);
+        QtNativeAndroid::callRealMethod(instance(), "setPivotX", pivotX);
         emit pivotXChanged();
     }
 }
@@ -522,7 +522,7 @@ void QNativeAndroidView::setPivotY(qreal pivotY)
 {
     if (m_pivotY.isNull() || m_pivotY != pivotY) {
         m_pivotY = pivotY;
-        QtQmlAndroid::callRealMethod(instance(), "setPivotY", pivotY);
+        QtNativeAndroid::callRealMethod(instance(), "setPivotY", pivotY);
         emit pivotYChanged();
     }
 }
@@ -538,7 +538,7 @@ void QNativeAndroidView::setRotation(qreal rotation)
 {
     if (m_rotation.isNull() || m_rotation != rotation) {
         m_rotation = rotation;
-        QtQmlAndroid::callRealMethod(instance(), "setRotation", rotation);
+        QtNativeAndroid::callRealMethod(instance(), "setRotation", rotation);
         emit rotationChanged();
     }
 }
@@ -554,7 +554,7 @@ void QNativeAndroidView::setRotationX(qreal rotationX)
 {
     if (m_rotationX.isNull() || m_rotationX != rotationX) {
         m_rotationX = rotationX;
-        QtQmlAndroid::callRealMethod(instance(), "setRotationX", rotationX);
+        QtNativeAndroid::callRealMethod(instance(), "setRotationX", rotationX);
         emit rotationXChanged();
     }
 }
@@ -570,7 +570,7 @@ void QNativeAndroidView::setRotationY(qreal rotationY)
 {
     if (m_rotationY.isNull() || m_rotationY != rotationY) {
         m_rotationY = rotationY;
-        QtQmlAndroid::callRealMethod(instance(), "setRotationY", rotationY);
+        QtNativeAndroid::callRealMethod(instance(), "setRotationY", rotationY);
         emit rotationYChanged();
     }
 }
@@ -586,7 +586,7 @@ void QNativeAndroidView::setTranslationX(qreal translationX)
 {
     if (m_translationX.isNull() || m_translationX != translationX) {
         m_translationX = translationX;
-        QtQmlAndroid::callRealMethod(instance(), "setTranslationX", translationX);
+        QtNativeAndroid::callRealMethod(instance(), "setTranslationX", translationX);
         emit translationXChanged();
         emit xChanged();
     }
@@ -603,7 +603,7 @@ void QNativeAndroidView::setTranslationY(qreal translationY)
 {
     if (m_translationY.isNull() || m_translationY != translationY) {
         m_translationY = translationY;
-        QtQmlAndroid::callRealMethod(instance(), "setTranslationY", translationY);
+        QtNativeAndroid::callRealMethod(instance(), "setTranslationY", translationY);
         emit translationYChanged();
         emit yChanged();
     }
@@ -620,7 +620,7 @@ void QNativeAndroidView::setTranslationZ(qreal translationZ)
 {
     if (m_translationZ.isNull() || m_translationZ != translationZ) {
         m_translationZ = translationZ;
-        QtQmlAndroid::callRealMethod(instance(), "setTranslationZ", translationZ);
+        QtNativeAndroid::callRealMethod(instance(), "setTranslationZ", translationZ);
         emit translationZChanged();
         emit zChanged();
     }
@@ -637,7 +637,7 @@ void QNativeAndroidView::setElevation(qreal elevation)
 {
     if (m_elevation.isNull() || m_elevation != elevation) {
         m_elevation = elevation;
-        QtQmlAndroid::callRealMethod(instance(), "setElevation", elevation);
+        QtNativeAndroid::callRealMethod(instance(), "setElevation", elevation);
         emit elevationChanged();
         emit zChanged();
     }
@@ -702,7 +702,7 @@ void QNativeAndroidView::children_clear(QQmlListProperty<QNativeAndroidView> *li
 
 QAndroidJniObject QNativeAndroidView::onCreate()
 {
-    Q_ASSERT(!QtQmlAndroid::isMainQtThread());
+    Q_ASSERT(!QtNativeAndroid::isMainQtThread());
 
     return QAndroidJniObject("android/view/View",
                              "(Landroid/content/Context;)V",
@@ -711,7 +711,7 @@ QAndroidJniObject QNativeAndroidView::onCreate()
 
 void QNativeAndroidView::onInflate(QAndroidJniObject &instance)
 {
-    Q_ASSERT(!QtQmlAndroid::isMainQtThread());
+    Q_ASSERT(!QtNativeAndroid::isMainQtThread());
 
     QNativeAndroidContextual::onInflate(instance);
 
@@ -864,7 +864,7 @@ void QNativeAndroidView::updateBackground()
 
     QAndroidJniObject view = instance();
     QAndroidJniObject background = m_background->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         view.callMethod<void>("setBackground", "(Landroid/graphics/drawable/Drawable;)V", background.object());
     });
 }
@@ -876,7 +876,7 @@ void QNativeAndroidView::updateAnimation()
 
     QAndroidJniObject view = instance();
     QAndroidJniObject animation = m_animation->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         view.callMethod<void>("startAnimation", "(Landroid/view/animation/Animation;)V", animation.object());
     });
 }
@@ -888,7 +888,7 @@ void QNativeAndroidView::updateLayoutParams()
 
     QAndroidJniObject view = instance();
     QAndroidJniObject params = m_layoutParams->instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         view.callMethod<void>("setLayoutParams",
                               "(Landroid/view/ViewGroup$LayoutParams;)V",
                               params.object());
diff --git a/src/android/view/qnativeandroidviewgroup.cpp b/src/android/view/qnativeandroidviewgroup.cpp
index 9fbde46..376da38 100644
--- a/src/android/view/qnativeandroidviewgroup.cpp
+++ b/src/android/view/qnativeandroidviewgroup.cpp
@@ -75,7 +75,7 @@ void QNativeAndroidViewGroup::viewChange(ViewChange change, const ViewChangeData
     switch (change) {
     case ViewChildAddedChange: // data.view
         if (group.isValid()) {
-//            QtQmlAndroid::callFunction([=]() {
+//            QtNativeAndroid::callFunction([=]() {
 //                QAndroidJniObject child = data.view->onCreate();
 //                data.view->onInflate(child);
 //                data.view->setInstance(child);
@@ -86,7 +86,7 @@ void QNativeAndroidViewGroup::viewChange(ViewChange change, const ViewChangeData
     case ViewChildRemovedChange: // data.view
         if (group.isValid()) {
 //            QAndroidJniObject child = data.view->instance();
-//            QtQmlAndroid::callFunction([=]() {
+//            QtNativeAndroid::callFunction([=]() {
 //                group.callMethod<void>("removeView", "(Landroid/view/View;)V", child.object());
 //            });
 //            data.view->setInstance(QAndroidJniObject());
diff --git a/src/android/view/qnativeandroidwindow.cpp b/src/android/view/qnativeandroidwindow.cpp
index 28fc858..084a185 100644
--- a/src/android/view/qnativeandroidwindow.cpp
+++ b/src/android/view/qnativeandroidwindow.cpp
@@ -57,7 +57,7 @@ void QNativeAndroidWindow::setStatusBarColor(int color)
 {
     if (m_statusBarColor.isNull() || m_statusBarColor != color) {
         m_statusBarColor = color;
-        QtQmlAndroid::callIntMethod(instance(), "setStatusBarColor", color);
+        QtNativeAndroid::callIntMethod(instance(), "setStatusBarColor", color);
         emit statusBarColorChanged();
     }
 }
diff --git a/src/android/widget/qnativeandroidadapterview.cpp b/src/android/widget/qnativeandroidadapterview.cpp
index 2482d82..1688bf2 100644
--- a/src/android/widget/qnativeandroidadapterview.cpp
+++ b/src/android/widget/qnativeandroidadapterview.cpp
@@ -71,7 +71,7 @@ void QNativeAndroidAdapterView::setAdapter(QNativeAndroidBaseAdapter *adapter)
 
 void QNativeAndroidAdapterView::setSelection(int position)
 {
-    QtQmlAndroid::callIntMethod(instance(), "setSelection", position);
+    QtNativeAndroid::callIntMethod(instance(), "setSelection", position);
 }
 
 QAndroidJniObject QNativeAndroidAdapterView::onCreate()
@@ -133,7 +133,7 @@ void QNativeAndroidAdapterView::updateAdapter()
         adapter = m_adapter->instance();
 
     QAndroidJniObject view = instance();
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         view.callMethod<void>("setAdapter", "(Landroid/widget/Adapter;)V", adapter.object());
     });
 }
diff --git a/src/android/widget/qnativeandroidcompoundbutton.cpp b/src/android/widget/qnativeandroidcompoundbutton.cpp
index 889c761..e224a3a 100644
--- a/src/android/widget/qnativeandroidcompoundbutton.cpp
+++ b/src/android/widget/qnativeandroidcompoundbutton.cpp
@@ -52,7 +52,7 @@ bool QNativeAndroidCompoundButton::isChecked() const
 void QNativeAndroidCompoundButton::setChecked(bool checked)
 {
     if (updateChecked(checked))
-        QtQmlAndroid::callBoolMethod(instance(), "setChecked", checked);
+        QtNativeAndroid::callBoolMethod(instance(), "setChecked", checked);
 }
 
 bool QNativeAndroidCompoundButton::updateChecked(bool arg)
@@ -67,7 +67,7 @@ bool QNativeAndroidCompoundButton::updateChecked(bool arg)
 
 void QNativeAndroidCompoundButton::toggle()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "toggle");
+    QtNativeAndroid::callVoidMethod(instance(), "toggle");
 }
 
 QAndroidJniObject QNativeAndroidCompoundButton::onCreate()
diff --git a/src/android/widget/qnativeandroidimageview.cpp b/src/android/widget/qnativeandroidimageview.cpp
index 35e0d23..6d7ee31 100644
--- a/src/android/widget/qnativeandroidimageview.cpp
+++ b/src/android/widget/qnativeandroidimageview.cpp
@@ -56,7 +56,7 @@ void QNativeAndroidImageView::setImageURI(const QUrl &uri)
         if (isValid()) {
             QAndroidJniObject v = instance();
             QAndroidJniObject u = getUri();
-            QtQmlAndroid::callFunction([=]() {
+            QtNativeAndroid::callFunction([=]() {
                 v.callMethod<void>("setImageURI", "(Landroid/net/Uri;)V", u.object());
             });
         }
@@ -73,7 +73,7 @@ void QNativeAndroidImageView::setImageResource(int resource)
 {
     if (m_resource != resource) {
         m_resource = resource;
-        QtQmlAndroid::callIntMethod(instance(), "setImageResource", resource);
+        QtNativeAndroid::callIntMethod(instance(), "setImageResource", resource);
         emit imageResourceChanged();
     }
 }
@@ -91,7 +91,7 @@ void QNativeAndroidImageView::setImageTintColor(int color)
         m_tint = color;
         if (isValid()) {
             QAndroidJniObject view = instance();
-            QtQmlAndroid::callFunction([=]() {
+            QtNativeAndroid::callFunction([=]() {
                 QAndroidJniObject tint = QAndroidJniObject::callStaticObjectMethod("android/content/res/ColorStateList",
                                                                                    "valueOf",
                                                                                    "(I)Landroid/content/res/ColorStateList;",
diff --git a/src/android/widget/qnativeandroidnumberpicker.cpp b/src/android/widget/qnativeandroidnumberpicker.cpp
index 126e9ba..7254368 100644
--- a/src/android/widget/qnativeandroidnumberpicker.cpp
+++ b/src/android/widget/qnativeandroidnumberpicker.cpp
@@ -52,7 +52,7 @@ int QNativeAndroidNumberPicker::value() const
 void QNativeAndroidNumberPicker::setValue(int value)
 {
     if (updateValue(value))
-        QtQmlAndroid::callIntMethod(instance(), "setValue", value);
+        QtNativeAndroid::callIntMethod(instance(), "setValue", value);
 }
 
 bool QNativeAndroidNumberPicker::updateValue(int value)
diff --git a/src/android/widget/qnativeandroidpopupmenu.cpp b/src/android/widget/qnativeandroidpopupmenu.cpp
index 50299a4..6ec9342 100644
--- a/src/android/widget/qnativeandroidpopupmenu.cpp
+++ b/src/android/widget/qnativeandroidpopupmenu.cpp
@@ -104,7 +104,7 @@ void QNativeAndroidPopupMenu::show()
     QAndroidJniObject c = context->instance();
     QAndroidJniObject a = anchor->instance();
 
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject popup;
         if (!m_gravity.isNull()) {
             popup = QAndroidJniObject("android/widget/PopupMenu",
@@ -131,7 +131,7 @@ void QNativeAndroidPopupMenu::show()
 
 void QNativeAndroidPopupMenu::dismiss()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "dismiss");
+    QtNativeAndroid::callVoidMethod(instance(), "dismiss");
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidprogressbar.cpp b/src/android/widget/qnativeandroidprogressbar.cpp
index deb2823..62475fa 100644
--- a/src/android/widget/qnativeandroidprogressbar.cpp
+++ b/src/android/widget/qnativeandroidprogressbar.cpp
@@ -53,7 +53,7 @@ void QNativeAndroidProgressBar::setIndeterminate(bool indeterminate)
 {
     if (m_indeterminate != indeterminate) {
         m_indeterminate = indeterminate;
-        QtQmlAndroid::callBoolMethod(instance(), "setIndeterminate", indeterminate);
+        QtNativeAndroid::callBoolMethod(instance(), "setIndeterminate", indeterminate);
         emit indeterminateChanged();
     }
 }
@@ -66,7 +66,7 @@ int QNativeAndroidProgressBar::progress() const
 void QNativeAndroidProgressBar::setProgress(int progress)
 {
     if (updateProgress(progress))
-        QtQmlAndroid::callIntMethod(instance(), "setProgress", progress);
+        QtNativeAndroid::callIntMethod(instance(), "setProgress", progress);
 }
 
 bool QNativeAndroidProgressBar::updateProgress(int progress)
@@ -88,7 +88,7 @@ void QNativeAndroidProgressBar::setSecondaryProgress(int progress)
 {
     if (m_secondary != progress) {
         m_secondary = progress;
-        QtQmlAndroid::callIntMethod(instance(), "setSecondaryProgress", progress);
+        QtNativeAndroid::callIntMethod(instance(), "setSecondaryProgress", progress);
         emit secondaryProgressChanged();
     }
 }
@@ -102,7 +102,7 @@ void QNativeAndroidProgressBar::setMax(int max)
 {
     if (m_max != max) {
         m_max = max;
-        QtQmlAndroid::callIntMethod(instance(), "setMax", max);
+        QtNativeAndroid::callIntMethod(instance(), "setMax", max);
         emit maxChanged();
     }
 }
diff --git a/src/android/widget/qnativeandroidradiogroup.cpp b/src/android/widget/qnativeandroidradiogroup.cpp
index 3727206..7e1770b 100644
--- a/src/android/widget/qnativeandroidradiogroup.cpp
+++ b/src/android/widget/qnativeandroidradiogroup.cpp
@@ -53,12 +53,12 @@ QNativeAndroidRadioButton *QNativeAndroidRadioGroup::checkedButton() const
 void QNativeAndroidRadioGroup::setCheckedButton(QNativeAndroidRadioButton *button)
 {
     if (updateCheckedButton(button))
-        QtQmlAndroid::callIntMethod(instance(), "check", button ? button->identifier() : -1);
+        QtNativeAndroid::callIntMethod(instance(), "check", button ? button->identifier() : -1);
 }
 
 void QNativeAndroidRadioGroup::clearCheck()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "clearCheck");
+    QtNativeAndroid::callVoidMethod(instance(), "clearCheck");
 }
 
 QAndroidJniObject QNativeAndroidRadioGroup::onCreate()
diff --git a/src/android/widget/qnativeandroidratingbar.cpp b/src/android/widget/qnativeandroidratingbar.cpp
index 2efb815..29f0683 100644
--- a/src/android/widget/qnativeandroidratingbar.cpp
+++ b/src/android/widget/qnativeandroidratingbar.cpp
@@ -52,7 +52,7 @@ qreal QNativeAndroidRatingBar::rating() const
 void QNativeAndroidRatingBar::setRating(qreal rating)
 {
     if (updateRating(rating))
-        QtQmlAndroid::callRealMethod(instance(), "setRating", rating);
+        QtNativeAndroid::callRealMethod(instance(), "setRating", rating);
 }
 
 bool QNativeAndroidRatingBar::updateRating(qreal rating)
diff --git a/src/android/widget/qnativeandroidscrollview.cpp b/src/android/widget/qnativeandroidscrollview.cpp
index da75733..f54fcb1 100644
--- a/src/android/widget/qnativeandroidscrollview.cpp
+++ b/src/android/widget/qnativeandroidscrollview.cpp
@@ -54,7 +54,7 @@ int QNativeAndroidScrollView::scrollX() const
 void QNativeAndroidScrollView::setScrollX(int x)
 {
     if (updateScrollX(x))
-        QtQmlAndroid::callIntMethod(instance(), "setScrollX", x);
+        QtNativeAndroid::callIntMethod(instance(), "setScrollX", x);
 }
 
 bool QNativeAndroidScrollView::updateScrollX(int x)
@@ -76,7 +76,7 @@ int QNativeAndroidScrollView::scrollY() const
 void QNativeAndroidScrollView::setScrollY(int y)
 {
     if (updateScrollY(y))
-        QtQmlAndroid::callIntMethod(instance(), "setScrollY", y);
+        QtNativeAndroid::callIntMethod(instance(), "setScrollY", y);
 }
 
 bool QNativeAndroidScrollView::updateScrollY(int y)
diff --git a/src/android/widget/qnativeandroidtabspec.cpp b/src/android/widget/qnativeandroidtabspec.cpp
index fee84da..bef07be 100644
--- a/src/android/widget/qnativeandroidtabspec.cpp
+++ b/src/android/widget/qnativeandroidtabspec.cpp
@@ -79,7 +79,7 @@ void QNativeAndroidTabSpec::setup(QAndroidJniObject &host, int index)
     if (content)
         id = content->identifier();
 
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject spec = host.callObjectMethod("newTabSpec",
                                                        "(Ljava/lang/String;)Landroid/widget/TabHost$TabSpec;",
                                                        QAndroidJniObject::fromString(QString::number(index)).object());
diff --git a/src/android/widget/qnativeandroidtextview.cpp b/src/android/widget/qnativeandroidtextview.cpp
index c332ec8..0805571 100644
--- a/src/android/widget/qnativeandroidtextview.cpp
+++ b/src/android/widget/qnativeandroidtextview.cpp
@@ -54,7 +54,7 @@ void QNativeAndroidTextView::setText(const QString &text)
 {
     if (m_text != text) {
         m_text = text;
-        QtQmlAndroid::callTextMethod(instance(), "setText", text);
+        QtNativeAndroid::callTextMethod(instance(), "setText", text);
         emit textChanged();
     }
 }
@@ -70,7 +70,7 @@ void QNativeAndroidTextView::setTextColor(int color)
 {
     if (color != textColor()) {
         m_textColor = color;
-        QtQmlAndroid::callIntMethod(instance(), "setTextColor", color);
+        QtNativeAndroid::callIntMethod(instance(), "setTextColor", color);
         emit textColorChanged();
     }
 }
@@ -86,7 +86,7 @@ void QNativeAndroidTextView::setTextSize(qreal size)
 {
     if (size != textSize()) {
         m_textSize = size;
-        QtQmlAndroid::callRealMethod(instance(), "setTextSize", size);
+        QtNativeAndroid::callRealMethod(instance(), "setTextSize", size);
         emit textSizeChanged();
     }
 }
@@ -100,7 +100,7 @@ void QNativeAndroidTextView::setHint(const QString &hint)
 {
     if (m_hint != hint) {
         m_hint = hint;
-        QtQmlAndroid::callTextMethod(instance(), "setHint", hint);
+        QtNativeAndroid::callTextMethod(instance(), "setHint", hint);
         emit hintChanged();
     }
 }
@@ -114,7 +114,7 @@ void QNativeAndroidTextView::setSingleLine(bool singleLine)
 {
     if (m_singleLine != singleLine) {
         m_singleLine = singleLine;
-        QtQmlAndroid::callBoolMethod(instance(), "setSingleLine", singleLine);
+        QtNativeAndroid::callBoolMethod(instance(), "setSingleLine", singleLine);
         emit singleLineChanged();
     }
 }
@@ -130,7 +130,7 @@ void QNativeAndroidTextView::setInputType(int type)
 {
     if (m_inputType.isNull() || m_inputType != type) {
         m_inputType = type;
-        QtQmlAndroid::callIntMethod(instance(), "setInputType", type);
+        QtNativeAndroid::callIntMethod(instance(), "setInputType", type);
         emit inputTypeChanged();
     }
 }
diff --git a/src/android/widget/qnativeandroidtoast.cpp b/src/android/widget/qnativeandroidtoast.cpp
index 9725728..2c743dd 100644
--- a/src/android/widget/qnativeandroidtoast.cpp
+++ b/src/android/widget/qnativeandroidtoast.cpp
@@ -88,7 +88,7 @@ void QNativeAndroidToast::show()
         return;
     }
 
-    QtQmlAndroid::callFunction([=]() {
+    QtNativeAndroid::callFunction([=]() {
         QAndroidJniObject toast;
         if (!m_text.isNull()) {
             toast = QAndroidJniObject::callStaticObjectMethod("android/widget/Toast",
@@ -113,7 +113,7 @@ void QNativeAndroidToast::show()
 
 void QNativeAndroidToast::cancel()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "cancel");
+    QtNativeAndroid::callVoidMethod(instance(), "cancel");
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidtogglebutton.cpp b/src/android/widget/qnativeandroidtogglebutton.cpp
index 33a84c8..b39d29d 100644
--- a/src/android/widget/qnativeandroidtogglebutton.cpp
+++ b/src/android/widget/qnativeandroidtogglebutton.cpp
@@ -53,7 +53,7 @@ void QNativeAndroidToggleButton::setTextOn(const QString &text)
 {
     if (m_textOn != text) {
         m_textOn = text;
-        QtQmlAndroid::callTextMethod(instance(), "setTextOn", text);
+        QtNativeAndroid::callTextMethod(instance(), "setTextOn", text);
         emit textOnChanged();
     }
 }
@@ -67,7 +67,7 @@ void QNativeAndroidToggleButton::setTextOff(const QString &text)
 {
     if (m_textOff != text) {
         m_textOff = text;
-        QtQmlAndroid::callTextMethod(instance(), "setTextOff", text);
+        QtNativeAndroid::callTextMethod(instance(), "setTextOff", text);
         emit textOffChanged();
     }
 }
diff --git a/src/android/widget/qnativeandroidviewanimator.cpp b/src/android/widget/qnativeandroidviewanimator.cpp
index 7b9fec7..d42701c 100644
--- a/src/android/widget/qnativeandroidviewanimator.cpp
+++ b/src/android/widget/qnativeandroidviewanimator.cpp
@@ -55,7 +55,7 @@ void QNativeAndroidViewAnimator::setDisplayedChild(int child)
 {
     if (child != displayedChild()) {
         m_displayedChild = child;
-        QtQmlAndroid::callIntMethod(instance(), "setDisplayedChild", child);
+        QtNativeAndroid::callIntMethod(instance(), "setDisplayedChild", child);
         emit displayedChildChanged();
     }
 }
@@ -72,11 +72,11 @@ void QNativeAndroidViewAnimator::setInAnimation(int animation)
     if (animation != inAnimation()) {
         m_inAnimation = animation;
         if (instance().isValid()) {
-            QtQmlAndroid::callFunction([=]() {
+            QtNativeAndroid::callFunction([=]() {
                 instance().callMethod<void>("setInAnimation", "(Landroid/content/Context;I)V", ctx().object(), animation);
             });
         }
-        QtQmlAndroid::callIntMethod(instance(), "setInAnimation", animation);
+        QtNativeAndroid::callIntMethod(instance(), "setInAnimation", animation);
         emit inAnimationChanged();
     }
 }
@@ -93,23 +93,23 @@ void QNativeAndroidViewAnimator::setOutAnimation(int animation)
     if (animation != outAnimation()) {
         m_outAnimation = animation;
         if (instance().isValid()) {
-            QtQmlAndroid::callFunction([=]() {
+            QtNativeAndroid::callFunction([=]() {
                 instance().callMethod<void>("setOutAnimation", "(Landroid/content/Context;I)V", ctx().object(), animation);
             });
         }
-        QtQmlAndroid::callIntMethod(instance(), "setInAnimation", animation);
+        QtNativeAndroid::callIntMethod(instance(), "setInAnimation", animation);
         emit inAnimationChanged();
     }
 }
 
 void QNativeAndroidViewAnimator::showNext()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "showNext");
+    QtNativeAndroid::callVoidMethod(instance(), "showNext");
 }
 
 void QNativeAndroidViewAnimator::showPrevious()
 {
-    QtQmlAndroid::callVoidMethod(instance(), "showPrevious");
+    QtNativeAndroid::callVoidMethod(instance(), "showPrevious");
 }
 
 QAndroidJniObject QNativeAndroidViewAnimator::onCreate()