From d4830b9a7472f31f05f80b9e409d129d48118e34 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Wed, 14 Dec 2016 18:02:10 +0100
Subject: QNativeAndroidView: make ctor take a context

Reflecting the API of native Android View.

Change-Id: Ibb1f5fff1fda58a741a5d845a900990cc38d10f7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/android/content/qnativeandroidcontextual.cpp                  | 2 +-
 src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp      | 4 ++--
 src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h      | 2 +-
 .../support/v4/widget/qnativeandroidswiperefreshlayout.cpp        | 4 ++--
 .../support/v4/widget/qnativeandroidswiperefreshlayout_p.h        | 2 +-
 src/android/support/v7/widget/qnativeandroidcardview.cpp          | 4 ++--
 src/android/support/v7/widget/qnativeandroidcardview_p.h          | 2 +-
 src/android/support/v7/widget/qnativeandroidrecyclerview.cpp      | 4 ++--
 src/android/support/v7/widget/qnativeandroidrecyclerview_p.h      | 2 +-
 src/android/view/qnativeandroidview.cpp                           | 8 ++++----
 src/android/view/qnativeandroidview_p.h                           | 2 +-
 src/android/view/qnativeandroidviewgroup.cpp                      | 4 ++--
 src/android/view/qnativeandroidviewgroup_p.h                      | 2 +-
 src/android/widget/qnativeandroidabsseekbar.cpp                   | 4 ++--
 src/android/widget/qnativeandroidabsseekbar_p.h                   | 2 +-
 src/android/widget/qnativeandroidadapterview.cpp                  | 4 ++--
 src/android/widget/qnativeandroidadapterview_p.h                  | 2 +-
 src/android/widget/qnativeandroidbutton.cpp                       | 4 ++--
 src/android/widget/qnativeandroidbutton_p.h                       | 2 +-
 src/android/widget/qnativeandroidcalendarview.cpp                 | 4 ++--
 src/android/widget/qnativeandroidcalendarview_p.h                 | 2 +-
 src/android/widget/qnativeandroidcheckbox.cpp                     | 4 ++--
 src/android/widget/qnativeandroidcheckbox_p.h                     | 2 +-
 src/android/widget/qnativeandroidcompoundbutton.cpp               | 4 ++--
 src/android/widget/qnativeandroidcompoundbutton_p.h               | 2 +-
 src/android/widget/qnativeandroiddatepicker.cpp                   | 4 ++--
 src/android/widget/qnativeandroiddatepicker_p.h                   | 2 +-
 src/android/widget/qnativeandroidedittext.cpp                     | 4 ++--
 src/android/widget/qnativeandroidedittext_p.h                     | 2 +-
 src/android/widget/qnativeandroidframelayout.cpp                  | 4 ++--
 src/android/widget/qnativeandroidframelayout_p.h                  | 2 +-
 src/android/widget/qnativeandroidimageview.cpp                    | 4 ++--
 src/android/widget/qnativeandroidimageview_p.h                    | 2 +-
 src/android/widget/qnativeandroidlinearlayout.cpp                 | 4 ++--
 src/android/widget/qnativeandroidlinearlayout_p.h                 | 2 +-
 src/android/widget/qnativeandroidlistview.cpp                     | 4 ++--
 src/android/widget/qnativeandroidlistview_p.h                     | 2 +-
 src/android/widget/qnativeandroidnumberpicker.cpp                 | 4 ++--
 src/android/widget/qnativeandroidnumberpicker_p.h                 | 2 +-
 src/android/widget/qnativeandroidprogressbar.cpp                  | 4 ++--
 src/android/widget/qnativeandroidprogressbar_p.h                  | 2 +-
 src/android/widget/qnativeandroidradiobutton.cpp                  | 4 ++--
 src/android/widget/qnativeandroidradiobutton_p.h                  | 2 +-
 src/android/widget/qnativeandroidradiogroup.cpp                   | 4 ++--
 src/android/widget/qnativeandroidradiogroup_p.h                   | 2 +-
 src/android/widget/qnativeandroidratingbar.cpp                    | 4 ++--
 src/android/widget/qnativeandroidratingbar_p.h                    | 2 +-
 src/android/widget/qnativeandroidrelativelayout.cpp               | 4 ++--
 src/android/widget/qnativeandroidrelativelayout_p.h               | 2 +-
 src/android/widget/qnativeandroidscrollview.cpp                   | 4 ++--
 src/android/widget/qnativeandroidscrollview_p.h                   | 2 +-
 src/android/widget/qnativeandroidsearchview.cpp                   | 4 ++--
 src/android/widget/qnativeandroidsearchview_p.h                   | 2 +-
 src/android/widget/qnativeandroidseekbar.cpp                      | 4 ++--
 src/android/widget/qnativeandroidseekbar_p.h                      | 2 +-
 src/android/widget/qnativeandroidspace.cpp                        | 4 ++--
 src/android/widget/qnativeandroidspace_p.h                        | 2 +-
 src/android/widget/qnativeandroidspinner.cpp                      | 4 ++--
 src/android/widget/qnativeandroidspinner_p.h                      | 2 +-
 src/android/widget/qnativeandroidswitch.cpp                       | 4 ++--
 src/android/widget/qnativeandroidswitch_p.h                       | 2 +-
 src/android/widget/qnativeandroidtabhost.cpp                      | 4 ++--
 src/android/widget/qnativeandroidtabhost_p.h                      | 2 +-
 src/android/widget/qnativeandroidtabwidget.cpp                    | 4 ++--
 src/android/widget/qnativeandroidtabwidget_p.h                    | 2 +-
 src/android/widget/qnativeandroidtextview.cpp                     | 4 ++--
 src/android/widget/qnativeandroidtextview_p.h                     | 2 +-
 src/android/widget/qnativeandroidtimepicker.cpp                   | 4 ++--
 src/android/widget/qnativeandroidtimepicker_p.h                   | 2 +-
 src/android/widget/qnativeandroidtogglebutton.cpp                 | 4 ++--
 src/android/widget/qnativeandroidtogglebutton_p.h                 | 2 +-
 src/android/widget/qnativeandroidviewanimator.cpp                 | 4 ++--
 src/android/widget/qnativeandroidviewanimator_p.h                 | 2 +-
 src/android/widget/qnativeandroidviewflipper.cpp                  | 4 ++--
 src/android/widget/qnativeandroidviewflipper_p.h                  | 2 +-
 src/android/widget/qnativeandroidviewswitcher.cpp                 | 4 ++--
 src/android/widget/qnativeandroidviewswitcher_p.h                 | 2 +-
 77 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/src/android/content/qnativeandroidcontextual.cpp b/src/android/content/qnativeandroidcontextual.cpp
index e8478f8..1e5be09 100644
--- a/src/android/content/qnativeandroidcontextual.cpp
+++ b/src/android/content/qnativeandroidcontextual.cpp
@@ -48,7 +48,7 @@ QNativeAndroidContextual::QNativeAndroidContextual(QObject *parent) :
 }
 
 QNativeAndroidContextual::QNativeAndroidContextual(QNativeAndroidContext* context, QObject *parent) :
-    QNativeAndroidObject(parent), m_context(0)
+    QNativeAndroidObject(parent || context == this ? parent : context), m_context(0)
 {
     if (!initContext(context))
         QMetaObject::invokeMethod(this, "resolveContext", Qt::QueuedConnection);
diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
index d0529ef..2ec6327 100644
--- a/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
@@ -40,8 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidDrawerLayout::QNativeAndroidDrawerLayout(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent)
+QNativeAndroidDrawerLayout::QNativeAndroidDrawerLayout(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context)
 {
 }
 
diff --git a/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
index 91e61cd..def9a63 100644
--- a/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidDrawerLayout : public QNativeAndroidView
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidDrawerLayout(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidDrawerLayout(QNativeAndroidContext *context = nullptr);
 
     static QNativeAndroidDrawerLayoutParams *qmlAttachedProperties(QObject *object);
 
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
index 0211e14..6bfaf0f 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidSwipeRefreshLayout::QNativeAndroidSwipeRefreshLayout(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent), m_refreshing(false)
+QNativeAndroidSwipeRefreshLayout::QNativeAndroidSwipeRefreshLayout(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context), m_refreshing(false)
 {
 }
 
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
index ff14592..cb872ff 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidSwipeRefreshLayout : public QNativeAndro
     Q_PROPERTY(bool refreshing READ isRefreshing WRITE setRefreshing NOTIFY refreshingChanged)
 
 public:
-    explicit QNativeAndroidSwipeRefreshLayout(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidSwipeRefreshLayout(QNativeAndroidContext *context = nullptr);
 
     bool isRefreshing() const;
     void setRefreshing(bool refreshing);
diff --git a/src/android/support/v7/widget/qnativeandroidcardview.cpp b/src/android/support/v7/widget/qnativeandroidcardview.cpp
index 75b5355..1e57a17 100644
--- a/src/android/support/v7/widget/qnativeandroidcardview.cpp
+++ b/src/android/support/v7/widget/qnativeandroidcardview.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidCardView::QNativeAndroidCardView(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidCardView::QNativeAndroidCardView(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/support/v7/widget/qnativeandroidcardview_p.h b/src/android/support/v7/widget/qnativeandroidcardview_p.h
index 7d5674f..f0e4136 100644
--- a/src/android/support/v7/widget/qnativeandroidcardview_p.h
+++ b/src/android/support/v7/widget/qnativeandroidcardview_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidCardView : public QNativeAndroidFrameLay
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidCardView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidCardView(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
index fdb190d..c5697fe 100644
--- a/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
@@ -40,8 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidRecyclerView::QNativeAndroidRecyclerView(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent), m_adapter(0)
+QNativeAndroidRecyclerView::QNativeAndroidRecyclerView(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context), m_adapter(0)
 {
 }
 
diff --git a/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
index e1f1d51..ec174cc 100644
--- a/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
@@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidRecyclerView : public QNativeAndroidView
     Q_PROPERTY(QNativeAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged)
 
 public:
-    explicit QNativeAndroidRecyclerView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidRecyclerView(QNativeAndroidContext *context = nullptr);
 
     QNativeAndroidRecyclerAdapter *adapter() const;
     void setAdapter(QNativeAndroidRecyclerAdapter *adapter);
diff --git a/src/android/view/qnativeandroidview.cpp b/src/android/view/qnativeandroidview.cpp
index d12c338..31f8e4d 100644
--- a/src/android/view/qnativeandroidview.cpp
+++ b/src/android/view/qnativeandroidview.cpp
@@ -46,16 +46,16 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidView::QNativeAndroidView(QNativeAndroidView *parent) :
-    QNativeAndroidContextual(parent), m_parent(0), m_background(0), m_backgroundResource(0),
+QNativeAndroidView::QNativeAndroidView(QNativeAndroidContext *context) :
+    QNativeAndroidContextual(context), m_parent(0), m_background(0), m_backgroundResource(0),
     m_animation(0), m_polishing(false), m_visible(true), m_layoutParams(0),
     m_top(0), m_left(0), m_right(0), m_bottom(0)
 {
     static int id = 0;
     m_id = ++id;
 
-    if (parent)
-        setParentView(parent);
+    if (context)
+        setContext(context);
 
     // TODO: find a better place for this (upon construction of the native control perhaps?)
     requestPolish();
diff --git a/src/android/view/qnativeandroidview_p.h b/src/android/view/qnativeandroidview_p.h
index efb515e..a44c655 100644
--- a/src/android/view/qnativeandroidview_p.h
+++ b/src/android/view/qnativeandroidview_p.h
@@ -104,7 +104,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidView : public QNativeAndroidContextual
     Q_PROPERTY(qreal translationZ READ translationZ WRITE setTranslationZ NOTIFY translationZChanged)
 
 public:
-    explicit QNativeAndroidView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidView(QNativeAndroidContext *context = nullptr);
     ~QNativeAndroidView();
 
     int identifier() const;
diff --git a/src/android/view/qnativeandroidviewgroup.cpp b/src/android/view/qnativeandroidviewgroup.cpp
index 0d08c3a..7e1bac5 100644
--- a/src/android/view/qnativeandroidviewgroup.cpp
+++ b/src/android/view/qnativeandroidviewgroup.cpp
@@ -41,8 +41,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidViewGroup::QNativeAndroidViewGroup(QNativeAndroidView *parent) :
-    QNativeAndroidView(parent)
+QNativeAndroidViewGroup::QNativeAndroidViewGroup(QNativeAndroidContext *context) :
+    QNativeAndroidView(context)
 {
 }
 
diff --git a/src/android/view/qnativeandroidviewgroup_p.h b/src/android/view/qnativeandroidviewgroup_p.h
index b3565b0..6535eb6 100644
--- a/src/android/view/qnativeandroidviewgroup_p.h
+++ b/src/android/view/qnativeandroidviewgroup_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidViewGroup : public QNativeAndroidView
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidViewGroup(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidViewGroup(QNativeAndroidContext *context = nullptr);
 
     static QNativeAndroidLayoutParams *qmlAttachedProperties(QObject *object);
 
diff --git a/src/android/widget/qnativeandroidabsseekbar.cpp b/src/android/widget/qnativeandroidabsseekbar.cpp
index 7adb19a..5e1eb4f 100644
--- a/src/android/widget/qnativeandroidabsseekbar.cpp
+++ b/src/android/widget/qnativeandroidabsseekbar.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidAbsSeekBar::QNativeAndroidAbsSeekBar(QNativeAndroidView *parent) :
-    QNativeAndroidProgressBar(parent)
+QNativeAndroidAbsSeekBar::QNativeAndroidAbsSeekBar(QNativeAndroidContext *context) :
+    QNativeAndroidProgressBar(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidabsseekbar_p.h b/src/android/widget/qnativeandroidabsseekbar_p.h
index 2f4c2ad..39d1962 100644
--- a/src/android/widget/qnativeandroidabsseekbar_p.h
+++ b/src/android/widget/qnativeandroidabsseekbar_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidAbsSeekBar : public QNativeAndroidProgre
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidAbsSeekBar(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidAbsSeekBar(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidadapterview.cpp b/src/android/widget/qnativeandroidadapterview.cpp
index d6382d4..1fc3bfb 100644
--- a/src/android/widget/qnativeandroidadapterview.cpp
+++ b/src/android/widget/qnativeandroidadapterview.cpp
@@ -40,8 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidAdapterView::QNativeAndroidAdapterView(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent), m_adapter(0)
+QNativeAndroidAdapterView::QNativeAndroidAdapterView(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context), m_adapter(0)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidadapterview_p.h b/src/android/widget/qnativeandroidadapterview_p.h
index 03dae78..76645cc 100644
--- a/src/android/widget/qnativeandroidadapterview_p.h
+++ b/src/android/widget/qnativeandroidadapterview_p.h
@@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidAdapterView : public QNativeAndroidViewG
     Q_PROPERTY(QNativeAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter
 
 public:
-    explicit QNativeAndroidAdapterView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidAdapterView(QNativeAndroidContext *context = nullptr);
 
     QNativeAndroidBaseAdapter *adapter() const;
     void setAdapter(QNativeAndroidBaseAdapter *adapter);
diff --git a/src/android/widget/qnativeandroidbutton.cpp b/src/android/widget/qnativeandroidbutton.cpp
index 97349ac..3222013 100644
--- a/src/android/widget/qnativeandroidbutton.cpp
+++ b/src/android/widget/qnativeandroidbutton.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidButton::QNativeAndroidButton(QNativeAndroidView *parent) :
-    QNativeAndroidTextView(parent)
+QNativeAndroidButton::QNativeAndroidButton(QNativeAndroidContext *context) :
+    QNativeAndroidTextView(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidbutton_p.h b/src/android/widget/qnativeandroidbutton_p.h
index 18ed287..15e30ed 100644
--- a/src/android/widget/qnativeandroidbutton_p.h
+++ b/src/android/widget/qnativeandroidbutton_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidButton : public QNativeAndroidTextView
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidButton(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidButton(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidcalendarview.cpp b/src/android/widget/qnativeandroidcalendarview.cpp
index dc2459c..16efbb8 100644
--- a/src/android/widget/qnativeandroidcalendarview.cpp
+++ b/src/android/widget/qnativeandroidcalendarview.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidCalendarView::QNativeAndroidCalendarView(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidCalendarView::QNativeAndroidCalendarView(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidcalendarview_p.h b/src/android/widget/qnativeandroidcalendarview_p.h
index d6026d3..f5d7296 100644
--- a/src/android/widget/qnativeandroidcalendarview_p.h
+++ b/src/android/widget/qnativeandroidcalendarview_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidCalendarView : public QNativeAndroidFram
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidCalendarView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidCalendarView(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidcheckbox.cpp b/src/android/widget/qnativeandroidcheckbox.cpp
index c6df337..3cc23db 100644
--- a/src/android/widget/qnativeandroidcheckbox.cpp
+++ b/src/android/widget/qnativeandroidcheckbox.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidCheckBox::QNativeAndroidCheckBox(QNativeAndroidView *parent) :
-    QNativeAndroidCompoundButton(parent)
+QNativeAndroidCheckBox::QNativeAndroidCheckBox(QNativeAndroidContext *context) :
+    QNativeAndroidCompoundButton(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidcheckbox_p.h b/src/android/widget/qnativeandroidcheckbox_p.h
index 5c488e4..4124d4d 100644
--- a/src/android/widget/qnativeandroidcheckbox_p.h
+++ b/src/android/widget/qnativeandroidcheckbox_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidCheckBox : public QNativeAndroidCompound
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidCheckBox(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidCheckBox(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidcompoundbutton.cpp b/src/android/widget/qnativeandroidcompoundbutton.cpp
index b49bb98..abee8bd 100644
--- a/src/android/widget/qnativeandroidcompoundbutton.cpp
+++ b/src/android/widget/qnativeandroidcompoundbutton.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidCompoundButton::QNativeAndroidCompoundButton(QNativeAndroidView *parent) :
-    QNativeAndroidButton(parent), m_checked(false)
+QNativeAndroidCompoundButton::QNativeAndroidCompoundButton(QNativeAndroidContext *context) :
+    QNativeAndroidButton(context), m_checked(false)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidcompoundbutton_p.h b/src/android/widget/qnativeandroidcompoundbutton_p.h
index d5ba1fb..2c60353 100644
--- a/src/android/widget/qnativeandroidcompoundbutton_p.h
+++ b/src/android/widget/qnativeandroidcompoundbutton_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidCompoundButton : public QNativeAndroidBu
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged)
 
 public:
-    explicit QNativeAndroidCompoundButton(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidCompoundButton(QNativeAndroidContext *context = nullptr);
 
     bool isChecked() const;
     void setChecked(bool checked);
diff --git a/src/android/widget/qnativeandroiddatepicker.cpp b/src/android/widget/qnativeandroiddatepicker.cpp
index b028294..f144eb8 100644
--- a/src/android/widget/qnativeandroiddatepicker.cpp
+++ b/src/android/widget/qnativeandroiddatepicker.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidDatePicker::QNativeAndroidDatePicker(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidDatePicker::QNativeAndroidDatePicker(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroiddatepicker_p.h b/src/android/widget/qnativeandroiddatepicker_p.h
index af6a86c..e566117 100644
--- a/src/android/widget/qnativeandroiddatepicker_p.h
+++ b/src/android/widget/qnativeandroiddatepicker_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidDatePicker : public QNativeAndroidFrameL
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidDatePicker(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidDatePicker(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidedittext.cpp b/src/android/widget/qnativeandroidedittext.cpp
index 42b457a..d09808c 100644
--- a/src/android/widget/qnativeandroidedittext.cpp
+++ b/src/android/widget/qnativeandroidedittext.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidEditText::QNativeAndroidEditText(QNativeAndroidView *parent) :
-    QNativeAndroidTextView(parent)
+QNativeAndroidEditText::QNativeAndroidEditText(QNativeAndroidContext *context) :
+    QNativeAndroidTextView(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidedittext_p.h b/src/android/widget/qnativeandroidedittext_p.h
index 733922b..21e4bfc 100644
--- a/src/android/widget/qnativeandroidedittext_p.h
+++ b/src/android/widget/qnativeandroidedittext_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidEditText : public QNativeAndroidTextView
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidEditText(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidEditText(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidframelayout.cpp b/src/android/widget/qnativeandroidframelayout.cpp
index fb31e35..94798f6 100644
--- a/src/android/widget/qnativeandroidframelayout.cpp
+++ b/src/android/widget/qnativeandroidframelayout.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidFrameLayout::QNativeAndroidFrameLayout(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent)
+QNativeAndroidFrameLayout::QNativeAndroidFrameLayout(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidframelayout_p.h b/src/android/widget/qnativeandroidframelayout_p.h
index b2f80ed..908e3ff 100644
--- a/src/android/widget/qnativeandroidframelayout_p.h
+++ b/src/android/widget/qnativeandroidframelayout_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidFrameLayout : public QNativeAndroidViewG
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidFrameLayout(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidFrameLayout(QNativeAndroidContext *context = nullptr);
 
     static QNativeAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object);
 
diff --git a/src/android/widget/qnativeandroidimageview.cpp b/src/android/widget/qnativeandroidimageview.cpp
index 899bd61..d240c1b 100644
--- a/src/android/widget/qnativeandroidimageview.cpp
+++ b/src/android/widget/qnativeandroidimageview.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidImageView::QNativeAndroidImageView(QNativeAndroidView *parent) :
-    QNativeAndroidView(parent), m_resource(0)
+QNativeAndroidImageView::QNativeAndroidImageView(QNativeAndroidContext *context) :
+    QNativeAndroidView(context), m_resource(0)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidimageview_p.h b/src/android/widget/qnativeandroidimageview_p.h
index d37ed89..3c1f41d 100644
--- a/src/android/widget/qnativeandroidimageview_p.h
+++ b/src/android/widget/qnativeandroidimageview_p.h
@@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidImageView : public QNativeAndroidView
     Q_PROPERTY(int imageTintColor READ imageTintColor WRITE setImageTintColor NOTIFY imageTintColorChanged)
 
 public:
-    explicit QNativeAndroidImageView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidImageView(QNativeAndroidContext *context = nullptr);
 
     QUrl imageURI() const;
     void setImageURI(const QUrl &uri);
diff --git a/src/android/widget/qnativeandroidlinearlayout.cpp b/src/android/widget/qnativeandroidlinearlayout.cpp
index 8fb1261..04b7902 100644
--- a/src/android/widget/qnativeandroidlinearlayout.cpp
+++ b/src/android/widget/qnativeandroidlinearlayout.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidLinearLayout::QNativeAndroidLinearLayout(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent)
+QNativeAndroidLinearLayout::QNativeAndroidLinearLayout(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidlinearlayout_p.h b/src/android/widget/qnativeandroidlinearlayout_p.h
index 259f96e..666c7bd 100644
--- a/src/android/widget/qnativeandroidlinearlayout_p.h
+++ b/src/android/widget/qnativeandroidlinearlayout_p.h
@@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidLinearLayout : public QNativeAndroidView
     Q_ENUMS(Orientation)
 
 public:
-    explicit QNativeAndroidLinearLayout(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidLinearLayout(QNativeAndroidContext *context = nullptr);
 
     static QNativeAndroidLinearLayoutParams *qmlAttachedProperties(QObject *object);
 
diff --git a/src/android/widget/qnativeandroidlistview.cpp b/src/android/widget/qnativeandroidlistview.cpp
index 8dddd08..5316568 100644
--- a/src/android/widget/qnativeandroidlistview.cpp
+++ b/src/android/widget/qnativeandroidlistview.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidListView::QNativeAndroidListView(QNativeAndroidView *parent) :
-    QNativeAndroidAdapterView(parent)
+QNativeAndroidListView::QNativeAndroidListView(QNativeAndroidContext *context) :
+    QNativeAndroidAdapterView(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidlistview_p.h b/src/android/widget/qnativeandroidlistview_p.h
index 39ab8e9..f319e37 100644
--- a/src/android/widget/qnativeandroidlistview_p.h
+++ b/src/android/widget/qnativeandroidlistview_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidListView : public QNativeAndroidAdapterV
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidListView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidListView(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidnumberpicker.cpp b/src/android/widget/qnativeandroidnumberpicker.cpp
index aca2cf2..e260400 100644
--- a/src/android/widget/qnativeandroidnumberpicker.cpp
+++ b/src/android/widget/qnativeandroidnumberpicker.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidNumberPicker::QNativeAndroidNumberPicker(QNativeAndroidView *parent) :
-    QNativeAndroidLinearLayout(parent), m_value(0)
+QNativeAndroidNumberPicker::QNativeAndroidNumberPicker(QNativeAndroidContext *context) :
+    QNativeAndroidLinearLayout(context), m_value(0)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidnumberpicker_p.h b/src/android/widget/qnativeandroidnumberpicker_p.h
index c3142c8..7bc2d35 100644
--- a/src/android/widget/qnativeandroidnumberpicker_p.h
+++ b/src/android/widget/qnativeandroidnumberpicker_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidNumberPicker : public QNativeAndroidLine
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    explicit QNativeAndroidNumberPicker(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidNumberPicker(QNativeAndroidContext *context = nullptr);
 
     int value() const;
     void setValue(int value);
diff --git a/src/android/widget/qnativeandroidprogressbar.cpp b/src/android/widget/qnativeandroidprogressbar.cpp
index bf23f2d..2044a7e 100644
--- a/src/android/widget/qnativeandroidprogressbar.cpp
+++ b/src/android/widget/qnativeandroidprogressbar.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidProgressBar::QNativeAndroidProgressBar(QNativeAndroidView *parent) :
-    QNativeAndroidView(parent), m_max(100), m_progress(0), m_secondary(0), m_indeterminate(false)
+QNativeAndroidProgressBar::QNativeAndroidProgressBar(QNativeAndroidContext *context) :
+    QNativeAndroidView(context), m_max(100), m_progress(0), m_secondary(0), m_indeterminate(false)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidprogressbar_p.h b/src/android/widget/qnativeandroidprogressbar_p.h
index ec40fa6..394dbb7 100644
--- a/src/android/widget/qnativeandroidprogressbar_p.h
+++ b/src/android/widget/qnativeandroidprogressbar_p.h
@@ -64,7 +64,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidProgressBar : public QNativeAndroidView
     Q_ENUMS(Style)
 
 public:
-    explicit QNativeAndroidProgressBar(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidProgressBar(QNativeAndroidContext *context = nullptr);
 
     bool isIndeterminate() const;
     void setIndeterminate(bool indeterminate);
diff --git a/src/android/widget/qnativeandroidradiobutton.cpp b/src/android/widget/qnativeandroidradiobutton.cpp
index 5cce598..daf19ee 100644
--- a/src/android/widget/qnativeandroidradiobutton.cpp
+++ b/src/android/widget/qnativeandroidradiobutton.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidRadioButton::QNativeAndroidRadioButton(QNativeAndroidView *parent) :
-    QNativeAndroidCompoundButton(parent)
+QNativeAndroidRadioButton::QNativeAndroidRadioButton(QNativeAndroidContext *context) :
+    QNativeAndroidCompoundButton(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidradiobutton_p.h b/src/android/widget/qnativeandroidradiobutton_p.h
index 2ace82f..1ffc493 100644
--- a/src/android/widget/qnativeandroidradiobutton_p.h
+++ b/src/android/widget/qnativeandroidradiobutton_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidRadioButton : public QNativeAndroidCompo
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidRadioButton(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidRadioButton(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidradiogroup.cpp b/src/android/widget/qnativeandroidradiogroup.cpp
index fd2e1c6..b2811cb 100644
--- a/src/android/widget/qnativeandroidradiogroup.cpp
+++ b/src/android/widget/qnativeandroidradiogroup.cpp
@@ -40,8 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidRadioGroup::QNativeAndroidRadioGroup(QNativeAndroidView *parent) :
-    QNativeAndroidLinearLayout(parent), m_checkedButton(0)
+QNativeAndroidRadioGroup::QNativeAndroidRadioGroup(QNativeAndroidContext *context) :
+    QNativeAndroidLinearLayout(context), m_checkedButton(0)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidradiogroup_p.h b/src/android/widget/qnativeandroidradiogroup_p.h
index dab3b40..a4c2466 100644
--- a/src/android/widget/qnativeandroidradiogroup_p.h
+++ b/src/android/widget/qnativeandroidradiogroup_p.h
@@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidRadioGroup : public QNativeAndroidLinear
     Q_PROPERTY(QNativeAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
 
 public:
-    explicit QNativeAndroidRadioGroup(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidRadioGroup(QNativeAndroidContext *context = nullptr);
 
     QNativeAndroidRadioButton *checkedButton() const;
     void setCheckedButton(QNativeAndroidRadioButton *button);
diff --git a/src/android/widget/qnativeandroidratingbar.cpp b/src/android/widget/qnativeandroidratingbar.cpp
index 4ef126b..d3e7f29 100644
--- a/src/android/widget/qnativeandroidratingbar.cpp
+++ b/src/android/widget/qnativeandroidratingbar.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidRatingBar::QNativeAndroidRatingBar(QNativeAndroidView *parent) :
-    QNativeAndroidAbsSeekBar(parent), m_rating(0.0)
+QNativeAndroidRatingBar::QNativeAndroidRatingBar(QNativeAndroidContext *context) :
+    QNativeAndroidAbsSeekBar(context), m_rating(0.0)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidratingbar_p.h b/src/android/widget/qnativeandroidratingbar_p.h
index 824bba4..da5321a 100644
--- a/src/android/widget/qnativeandroidratingbar_p.h
+++ b/src/android/widget/qnativeandroidratingbar_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidRatingBar : public QNativeAndroidAbsSeek
     Q_PROPERTY(qreal rating READ rating WRITE setRating NOTIFY ratingChanged)
 
 public:
-    explicit QNativeAndroidRatingBar(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidRatingBar(QNativeAndroidContext *context = nullptr);
 
     qreal rating() const;
     void setRating(qreal rating);
diff --git a/src/android/widget/qnativeandroidrelativelayout.cpp b/src/android/widget/qnativeandroidrelativelayout.cpp
index 2161f90..04dae83 100644
--- a/src/android/widget/qnativeandroidrelativelayout.cpp
+++ b/src/android/widget/qnativeandroidrelativelayout.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidRelativeLayout::QNativeAndroidRelativeLayout(QNativeAndroidView *parent) :
-    QNativeAndroidViewGroup(parent)
+QNativeAndroidRelativeLayout::QNativeAndroidRelativeLayout(QNativeAndroidContext *context) :
+    QNativeAndroidViewGroup(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidrelativelayout_p.h b/src/android/widget/qnativeandroidrelativelayout_p.h
index 474ce96..aafeb54 100644
--- a/src/android/widget/qnativeandroidrelativelayout_p.h
+++ b/src/android/widget/qnativeandroidrelativelayout_p.h
@@ -58,7 +58,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidRelativeLayout : public QNativeAndroidVi
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidRelativeLayout(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidRelativeLayout(QNativeAndroidContext *context = nullptr);
 
     static QNativeAndroidRelativeLayoutParams *qmlAttachedProperties(QObject *object);
 
diff --git a/src/android/widget/qnativeandroidscrollview.cpp b/src/android/widget/qnativeandroidscrollview.cpp
index 6d66764..caa6cc4 100644
--- a/src/android/widget/qnativeandroidscrollview.cpp
+++ b/src/android/widget/qnativeandroidscrollview.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidScrollView::QNativeAndroidScrollView(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidScrollView::QNativeAndroidScrollView(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidscrollview_p.h b/src/android/widget/qnativeandroidscrollview_p.h
index c477832..13e6763 100644
--- a/src/android/widget/qnativeandroidscrollview_p.h
+++ b/src/android/widget/qnativeandroidscrollview_p.h
@@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidScrollView : public QNativeAndroidFrameL
     Q_PROPERTY(int scrollY READ scrollY WRITE setScrollY NOTIFY scrollYChanged)
 
 public:
-    explicit QNativeAndroidScrollView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidScrollView(QNativeAndroidContext *context = nullptr);
 
     int scrollX() const;
     void setScrollX(int x);
diff --git a/src/android/widget/qnativeandroidsearchview.cpp b/src/android/widget/qnativeandroidsearchview.cpp
index 78ce6b2..279d1d5 100644
--- a/src/android/widget/qnativeandroidsearchview.cpp
+++ b/src/android/widget/qnativeandroidsearchview.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidSearchView::QNativeAndroidSearchView(QNativeAndroidView *parent) :
-    QNativeAndroidLinearLayout(parent)
+QNativeAndroidSearchView::QNativeAndroidSearchView(QNativeAndroidContext *context) :
+    QNativeAndroidLinearLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidsearchview_p.h b/src/android/widget/qnativeandroidsearchview_p.h
index 67e382e..2609eae 100644
--- a/src/android/widget/qnativeandroidsearchview_p.h
+++ b/src/android/widget/qnativeandroidsearchview_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidSearchView : public QNativeAndroidLinear
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidSearchView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidSearchView(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidseekbar.cpp b/src/android/widget/qnativeandroidseekbar.cpp
index 48b60d6..48efbb1 100644
--- a/src/android/widget/qnativeandroidseekbar.cpp
+++ b/src/android/widget/qnativeandroidseekbar.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidSeekBar::QNativeAndroidSeekBar(QNativeAndroidView *parent) :
-    QNativeAndroidAbsSeekBar(parent)
+QNativeAndroidSeekBar::QNativeAndroidSeekBar(QNativeAndroidContext *context) :
+    QNativeAndroidAbsSeekBar(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidseekbar_p.h b/src/android/widget/qnativeandroidseekbar_p.h
index 220c6b3..54f9bd0 100644
--- a/src/android/widget/qnativeandroidseekbar_p.h
+++ b/src/android/widget/qnativeandroidseekbar_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidSeekBar : public QNativeAndroidAbsSeekBa
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidSeekBar(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidSeekBar(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidspace.cpp b/src/android/widget/qnativeandroidspace.cpp
index 7f68344..d8840b7 100644
--- a/src/android/widget/qnativeandroidspace.cpp
+++ b/src/android/widget/qnativeandroidspace.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidSpace::QNativeAndroidSpace(QNativeAndroidView *parent) :
-    QNativeAndroidView(parent)
+QNativeAndroidSpace::QNativeAndroidSpace(QNativeAndroidContext *context) :
+    QNativeAndroidView(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidspace_p.h b/src/android/widget/qnativeandroidspace_p.h
index d41c51d..f2b049a 100644
--- a/src/android/widget/qnativeandroidspace_p.h
+++ b/src/android/widget/qnativeandroidspace_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidSpace : public QNativeAndroidView
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidSpace(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidSpace(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidspinner.cpp b/src/android/widget/qnativeandroidspinner.cpp
index ee74291..a4881b6 100644
--- a/src/android/widget/qnativeandroidspinner.cpp
+++ b/src/android/widget/qnativeandroidspinner.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidSpinner::QNativeAndroidSpinner(QNativeAndroidView *parent) :
-    QNativeAndroidAdapterView(parent)
+QNativeAndroidSpinner::QNativeAndroidSpinner(QNativeAndroidContext *context) :
+    QNativeAndroidAdapterView(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidspinner_p.h b/src/android/widget/qnativeandroidspinner_p.h
index 77280d7..a7c2a08 100644
--- a/src/android/widget/qnativeandroidspinner_p.h
+++ b/src/android/widget/qnativeandroidspinner_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidSpinner : public QNativeAndroidAdapterVi
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidSpinner(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidSpinner(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidswitch.cpp b/src/android/widget/qnativeandroidswitch.cpp
index 7c9aa13..5e2479e 100644
--- a/src/android/widget/qnativeandroidswitch.cpp
+++ b/src/android/widget/qnativeandroidswitch.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidSwitch::QNativeAndroidSwitch(QNativeAndroidView *parent) :
-    QNativeAndroidCompoundButton(parent)
+QNativeAndroidSwitch::QNativeAndroidSwitch(QNativeAndroidContext *context) :
+    QNativeAndroidCompoundButton(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidswitch_p.h b/src/android/widget/qnativeandroidswitch_p.h
index 183fdfc..d454968 100644
--- a/src/android/widget/qnativeandroidswitch_p.h
+++ b/src/android/widget/qnativeandroidswitch_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidSwitch : public QNativeAndroidCompoundBu
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidSwitch(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidSwitch(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidtabhost.cpp b/src/android/widget/qnativeandroidtabhost.cpp
index 855c3bb..73a3e1d 100644
--- a/src/android/widget/qnativeandroidtabhost.cpp
+++ b/src/android/widget/qnativeandroidtabhost.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidTabHost::QNativeAndroidTabHost(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidTabHost::QNativeAndroidTabHost(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidtabhost_p.h b/src/android/widget/qnativeandroidtabhost_p.h
index 2543fca..fc41fb2 100644
--- a/src/android/widget/qnativeandroidtabhost_p.h
+++ b/src/android/widget/qnativeandroidtabhost_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidTabHost : public QNativeAndroidFrameLayo
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidTabHost(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidTabHost(QNativeAndroidContext *context = nullptr);
 
 Q_SIGNALS:
     void tabChanged(const QString &tabId);
diff --git a/src/android/widget/qnativeandroidtabwidget.cpp b/src/android/widget/qnativeandroidtabwidget.cpp
index 41d4267..86440a7 100644
--- a/src/android/widget/qnativeandroidtabwidget.cpp
+++ b/src/android/widget/qnativeandroidtabwidget.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidTabWidget::QNativeAndroidTabWidget(QNativeAndroidView *parent) :
-    QNativeAndroidLinearLayout(parent)
+QNativeAndroidTabWidget::QNativeAndroidTabWidget(QNativeAndroidContext *context) :
+    QNativeAndroidLinearLayout(context)
 {
     setIdentifier(16908307); // TODO: android.R.id.tabs
 }
diff --git a/src/android/widget/qnativeandroidtabwidget_p.h b/src/android/widget/qnativeandroidtabwidget_p.h
index bb3c5c7..b936872 100644
--- a/src/android/widget/qnativeandroidtabwidget_p.h
+++ b/src/android/widget/qnativeandroidtabwidget_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidTabWidget : public QNativeAndroidLinearL
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidTabWidget(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidTabWidget(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidtextview.cpp b/src/android/widget/qnativeandroidtextview.cpp
index c9b31da..b97ef39 100644
--- a/src/android/widget/qnativeandroidtextview.cpp
+++ b/src/android/widget/qnativeandroidtextview.cpp
@@ -40,8 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidTextView::QNativeAndroidTextView(QNativeAndroidView *parent) :
-    QNativeAndroidView(parent), m_singleLine(false)
+QNativeAndroidTextView::QNativeAndroidTextView(QNativeAndroidContext *context) :
+    QNativeAndroidView(context), m_singleLine(false)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidtextview_p.h b/src/android/widget/qnativeandroidtextview_p.h
index 1af8e29..51f0348 100644
--- a/src/android/widget/qnativeandroidtextview_p.h
+++ b/src/android/widget/qnativeandroidtextview_p.h
@@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidTextView : public QNativeAndroidView
     Q_PROPERTY(int inputType READ inputType WRITE setInputType NOTIFY inputTypeChanged)
 
 public:
-    explicit QNativeAndroidTextView(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidTextView(QNativeAndroidContext *context = nullptr);
 
     QString text() const;
     void setText(const QString &text);
diff --git a/src/android/widget/qnativeandroidtimepicker.cpp b/src/android/widget/qnativeandroidtimepicker.cpp
index a129344..8701f0c 100644
--- a/src/android/widget/qnativeandroidtimepicker.cpp
+++ b/src/android/widget/qnativeandroidtimepicker.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidTimePicker::QNativeAndroidTimePicker(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidTimePicker::QNativeAndroidTimePicker(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidtimepicker_p.h b/src/android/widget/qnativeandroidtimepicker_p.h
index b80aad1..47d9d2e 100644
--- a/src/android/widget/qnativeandroidtimepicker_p.h
+++ b/src/android/widget/qnativeandroidtimepicker_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidTimePicker : public QNativeAndroidFrameL
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidTimePicker(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidTimePicker(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidtogglebutton.cpp b/src/android/widget/qnativeandroidtogglebutton.cpp
index 58ee008..97f417e 100644
--- a/src/android/widget/qnativeandroidtogglebutton.cpp
+++ b/src/android/widget/qnativeandroidtogglebutton.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidToggleButton::QNativeAndroidToggleButton(QNativeAndroidView *parent) :
-    QNativeAndroidCompoundButton(parent)
+QNativeAndroidToggleButton::QNativeAndroidToggleButton(QNativeAndroidContext *context) :
+    QNativeAndroidCompoundButton(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidtogglebutton_p.h b/src/android/widget/qnativeandroidtogglebutton_p.h
index 8a89c3d..f70a385 100644
--- a/src/android/widget/qnativeandroidtogglebutton_p.h
+++ b/src/android/widget/qnativeandroidtogglebutton_p.h
@@ -59,7 +59,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidToggleButton : public QNativeAndroidComp
     Q_PROPERTY(QString textOff READ textOff WRITE setTextOff NOTIFY textOffChanged)
 
 public:
-    explicit QNativeAndroidToggleButton(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidToggleButton(QNativeAndroidContext *context = nullptr);
 
     QString textOn() const;
     void setTextOn(const QString &text);
diff --git a/src/android/widget/qnativeandroidviewanimator.cpp b/src/android/widget/qnativeandroidviewanimator.cpp
index 76d56c5..c4b4369 100644
--- a/src/android/widget/qnativeandroidviewanimator.cpp
+++ b/src/android/widget/qnativeandroidviewanimator.cpp
@@ -39,8 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidViewAnimator::QNativeAndroidViewAnimator(QNativeAndroidView *parent) :
-    QNativeAndroidFrameLayout(parent)
+QNativeAndroidViewAnimator::QNativeAndroidViewAnimator(QNativeAndroidContext *context) :
+    QNativeAndroidFrameLayout(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidviewanimator_p.h b/src/android/widget/qnativeandroidviewanimator_p.h
index d784382..22df1f1 100644
--- a/src/android/widget/qnativeandroidviewanimator_p.h
+++ b/src/android/widget/qnativeandroidviewanimator_p.h
@@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidViewAnimator : public QNativeAndroidFram
     Q_PROPERTY(int outAnimation READ outAnimation WRITE setOutAnimation NOTIFY outAnimationChanged)
 
 public:
-    explicit QNativeAndroidViewAnimator(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidViewAnimator(QNativeAndroidContext *context = nullptr);
 
     int displayedChild() const;
     void setDisplayedChild(int child);
diff --git a/src/android/widget/qnativeandroidviewflipper.cpp b/src/android/widget/qnativeandroidviewflipper.cpp
index 4e5e5b4..fa46eef 100644
--- a/src/android/widget/qnativeandroidviewflipper.cpp
+++ b/src/android/widget/qnativeandroidviewflipper.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidViewFlipper::QNativeAndroidViewFlipper(QNativeAndroidView *parent) :
-    QNativeAndroidViewAnimator(parent)
+QNativeAndroidViewFlipper::QNativeAndroidViewFlipper(QNativeAndroidContext *context) :
+    QNativeAndroidViewAnimator(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidviewflipper_p.h b/src/android/widget/qnativeandroidviewflipper_p.h
index d3190b8..4ef3bbe 100644
--- a/src/android/widget/qnativeandroidviewflipper_p.h
+++ b/src/android/widget/qnativeandroidviewflipper_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidViewFlipper : public QNativeAndroidViewA
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidViewFlipper(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidViewFlipper(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
diff --git a/src/android/widget/qnativeandroidviewswitcher.cpp b/src/android/widget/qnativeandroidviewswitcher.cpp
index f739b02..e12811a 100644
--- a/src/android/widget/qnativeandroidviewswitcher.cpp
+++ b/src/android/widget/qnativeandroidviewswitcher.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QNativeAndroidViewSwitcher::QNativeAndroidViewSwitcher(QNativeAndroidView *parent) :
-    QNativeAndroidViewAnimator(parent)
+QNativeAndroidViewSwitcher::QNativeAndroidViewSwitcher(QNativeAndroidContext *context) :
+    QNativeAndroidViewAnimator(context)
 {
 }
 
diff --git a/src/android/widget/qnativeandroidviewswitcher_p.h b/src/android/widget/qnativeandroidviewswitcher_p.h
index c4cff66..29e6d50 100644
--- a/src/android/widget/qnativeandroidviewswitcher_p.h
+++ b/src/android/widget/qnativeandroidviewswitcher_p.h
@@ -57,7 +57,7 @@ class Q_QMLANDROID_EXPORT QNativeAndroidViewSwitcher : public QNativeAndroidView
     Q_OBJECT
 
 public:
-    explicit QNativeAndroidViewSwitcher(QNativeAndroidView *parent = nullptr);
+    explicit QNativeAndroidViewSwitcher(QNativeAndroidContext *context = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
-- 
cgit v1.2.3