Move QML type registration to the QML plugins

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

38 files changed, 245 insertions, 1285 deletions

diff --git a/src/imports/android/qtqmlandroidplugin.cpp b/src/imports/android/qtqmlandroidplugin.cpp
index 31de808..c5fdfc6 100644
--- a/src/imports/android/qtqmlandroidplugin.cpp
+++ b/src/imports/android/qtqmlandroidplugin.cpp
@@ -35,7 +35,9 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidr_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +47,14 @@ class QtQmlAndroidPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerAndroidModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterSingletonType<QQmlAndroidR>(uri, 0, 21, "R", QQmlAndroidR::provider);
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidplugin.moc"
diff --git a/src/imports/app/qtqmlandroidappplugin.cpp b/src/imports/app/qtqmlandroidappplugin.cpp
index 9d663c7..1263964 100644
--- a/src/imports/app/qtqmlandroidappplugin.cpp
+++ b/src/imports/app/qtqmlandroidappplugin.cpp
@@ -35,7 +35,13 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidappmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidactionbar_p.h>
+#include <QtQmlAndroid/private/qqmlandroidactivity_p.h>
+#include <QtQmlAndroid/private/qqmlandroidalertdialog_p.h>
+#include <QtQmlAndroid/private/qqmlandroiddialog_p.h>
+#include <QtQmlAndroid/private/qqmlandroidservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +51,18 @@ class QtQmlAndroidAppPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerAppModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidAppPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidActionBar>(uri, 0, 21, "ActionBar");
+    qmlRegisterType<QQmlAndroidActivity>(uri, 0, 21, "Activity");
+    qmlRegisterType<QQmlAndroidAlertDialog>(uri, 0, 21, "AlertDialog");
+    qmlRegisterType<QQmlAndroidDialog>(uri, 0, 21, "Dialog");
+    qmlRegisterType<QQmlAndroidService>(uri, 0, 21, "Service");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidappplugin.moc"
diff --git a/src/imports/content/qtqmlandroidcontentplugin.cpp b/src/imports/content/qtqmlandroidcontentplugin.cpp
index 12e9510..857c23b 100644
--- a/src/imports/content/qtqmlandroidcontentplugin.cpp
+++ b/src/imports/content/qtqmlandroidcontentplugin.cpp
@@ -35,7 +35,9 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidcontentmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +47,14 @@ class QtQmlAndroidContentPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerContentModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidContentPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterUncreatableType<QQmlAndroidContext>(uri, 0, 21, "Context", QStringLiteral("Cannot create Context"));
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidcontentplugin.moc"
diff --git a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp b/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
index d53ec28..b83dfad 100644
--- a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
+++ b/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
@@ -35,7 +35,10 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroiddrawablemodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidcolordrawable_p.h>
+#include <QtQmlAndroid/private/qqmlandroiddrawable_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +48,15 @@ class QtQmlAndroidDrawablePlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerDrawableModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidDrawablePlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidColorDrawable>(uri, 0, 21, "ColorDrawable");
+    qmlRegisterType<QQmlAndroidDrawable>(uri, 0, 21, "Drawable");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroiddrawableplugin.moc"
diff --git a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp b/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
index 5670b5f..1f77c6b 100644
--- a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
+++ b/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
@@ -35,7 +35,9 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidgraphicsmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidcolor_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +47,14 @@ class QtQmlAndroidGraphicsPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerGraphicsModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidGraphicsPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterSingletonType<QQmlAndroidColor>(uri, 0, 21, "Color", QQmlAndroidColor::provider);
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidgraphicsplugin.moc"
diff --git a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp b/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
index 0f60360..2ade385 100644
--- a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
+++ b/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
@@ -35,7 +35,10 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidsupportmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroiddrawerlayout_p.h>
+#include <QtQmlAndroid/private/qqmlandroidswiperefreshlayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +48,15 @@ class QtQmlAndroidSupportV4WidgetPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerSupportV4WidgetModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidSupportV4WidgetPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidDrawerLayout>(uri, 0, 21, "DrawerLayout");
+    qmlRegisterType<QQmlAndroidSwipeRefreshLayout>(uri, 0, 21, "SwipeRefreshLayout");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidsupportv4widgetplugin.moc"
diff --git a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp b/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
index 20c6f57..ee0e1cf 100644
--- a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
+++ b/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
@@ -35,7 +35,9 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidsupportmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidactionbardrawertoggle_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +47,14 @@ class QtQmlAndroidSupportV7AppPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerSupportV7AppModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidSupportV7AppPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidActionBarDrawerToggle>(uri, 0, 21, "ActionBarDrawerToggle");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidsupportv7appplugin.moc"
diff --git a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp b/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
index d17a2ad..aa7d6a5 100644
--- a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
+++ b/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
@@ -35,7 +35,11 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidsupportmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidcardview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidrecycleradapter_p.h>
+#include <QtQmlAndroid/private/qqmlandroidrecyclerview_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +49,16 @@ class QtQmlAndroidSupportV7WidgetPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerSupportV7WidgetModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidSupportV7WidgetPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidCardView>(uri, 0, 21, "CardView");
+    qmlRegisterType<QQmlAndroidRecyclerAdapter>(uri, 0, 21, "RecyclerAdapter");
+    qmlRegisterType<QQmlAndroidRecyclerView>(uri, 0, 21, "RecyclerView");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidsupportv7widgetplugin.moc"
diff --git a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp b/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
index 5f3221b..893d857 100644
--- a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
+++ b/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
@@ -35,7 +35,24 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidanimationmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidacceleratedecelerateinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidaccelerateinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidalphaanimation_p.h>
+#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
+#include <QtQmlAndroid/private/qqmlandroidanimationset_p.h>
+#include <QtQmlAndroid/private/qqmlandroidanticipateinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidanticipateovershootinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidbounceinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidcycleinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroiddecelerateinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidlinearinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidovershootinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidpathinterpolator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidrotateanimation_p.h>
+#include <QtQmlAndroid/private/qqmlandroidscaleanimation_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtranslateanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +62,30 @@ class QtQmlAndroidAnimationPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerAnimationModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidAnimationPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidAccelerateDecelerateInterpolator>(uri, 0, 21, "AccelerateDecelerateInterpolator");
+    qmlRegisterType<QQmlAndroidAccelerateInterpolator>(uri, 0, 21, "AccelerateInterpolator");
+    qmlRegisterType<QQmlAndroidAlphaAnimation>(uri, 0, 21, "AlphaAnimation");
+    qmlRegisterType<QQmlAndroidAnimation>(uri, 0, 21, "Animation");
+    qmlRegisterType<QQmlAndroidAnimationSet>(uri, 0, 21, "AnimationSet");
+    qmlRegisterType<QQmlAndroidAnticipateInterpolator>(uri, 0, 21, "AnticipateInterpolator");
+    qmlRegisterType<QQmlAndroidAnticipateOvershootInterpolator>(uri, 0, 21, "AnticipateOvershootInterpolator");
+    qmlRegisterType<QQmlAndroidBounceInterpolator>(uri, 0, 21, "BounceInterpolator");
+    qmlRegisterType<QQmlAndroidCycleInterpolator>(uri, 0, 21, "CycleInterpolator");
+    qmlRegisterType<QQmlAndroidDecelerateInterpolator>(uri, 0, 21, "DecelerateInterpolator");
+    qmlRegisterUncreatableType<QQmlAndroidInterpolator>(uri, 0, 21, "Interpolator", QStringLiteral("Interpolator is abstract"));
+    qmlRegisterType<QQmlAndroidLinearInterpolator>(uri, 0, 21, "LinearInterpolator");
+    qmlRegisterType<QQmlAndroidOvershootInterpolator>(uri, 0, 21, "OvershootInterpolator");
+    qmlRegisterType<QQmlAndroidPathInterpolator>(uri, 0, 21, "PathInterpolator");
+    qmlRegisterType<QQmlAndroidRotateAnimation>(uri, 0, 21, "RotateAnimation");
+    qmlRegisterType<QQmlAndroidScaleAnimation>(uri, 0, 21, "ScaleAnimation");
+    qmlRegisterType<QQmlAndroidTranslateAnimation>(uri, 0, 21, "TranslateAnimation");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidanimationplugin.moc"
diff --git a/src/imports/view/qtqmlandroidviewplugin.cpp b/src/imports/view/qtqmlandroidviewplugin.cpp
index cb45e8a..e616913 100644
--- a/src/imports/view/qtqmlandroidviewplugin.cpp
+++ b/src/imports/view/qtqmlandroidviewplugin.cpp
@@ -35,7 +35,15 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidviewmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidgravity_p.h>
+#include <QtQmlAndroid/private/qqmlandroidlayoutparams_p.h>
+#include <QtQmlAndroid/private/qqmlandroidmenu_p.h>
+#include <QtQmlAndroid/private/qqmlandroidmenuitem_p.h>
+#include <QtQmlAndroid/private/qqmlandroidview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qqmlandroidwindow_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +53,20 @@ class QtQmlAndroidViewPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerViewModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidViewPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterUncreatableType<QQmlAndroidGravity>(uri, 0, 21, "Gravity", QStringLiteral("Gravity is an enum"));
+    qmlRegisterUncreatableType<QQmlAndroidLayoutParams>(uri, 0, 21, "Layout", QStringLiteral("Layout is an attached property"));
+    qmlRegisterType<QQmlAndroidMenu>(uri, 0, 21, "Menu");
+    qmlRegisterType<QQmlAndroidMenuItem>(uri, 0, 21, "MenuItem");
+    qmlRegisterType<QQmlAndroidView>(uri, 0, 21, "View");
+    qmlRegisterType<QQmlAndroidViewGroup>(uri, 0, 21, "ViewGroup");
+    qmlRegisterType<QQmlAndroidWindow>();
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidviewplugin.moc"
diff --git a/src/imports/widget/qtqmlandroidwidgetplugin.cpp b/src/imports/widget/qtqmlandroidwidgetplugin.cpp
index be00bea..4287ef5 100644
--- a/src/imports/widget/qtqmlandroidwidgetplugin.cpp
+++ b/src/imports/widget/qtqmlandroidwidgetplugin.cpp
@@ -35,7 +35,44 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQmlAndroid/private/qtqmlandroidwidgetmodule_p.h>
+#include <QtQml/qqml.h>
+
+#include <QtQmlAndroid/private/qqmlandroidarrayadapter_p.h>
+#include <QtQmlAndroid/private/qqmlandroidbutton_p.h>
+#include <QtQmlAndroid/private/qqmlandroidcalendarview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidcheckbox_p.h>
+#include <QtQmlAndroid/private/qqmlandroiddatepicker_p.h>
+#include <QtQmlAndroid/private/qqmlandroidedittext_p.h>
+#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qqmlandroidframelayoutparams_p.h>
+#include <QtQmlAndroid/private/qqmlandroidimageview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidlinearlayout_p.h>
+#include <QtQmlAndroid/private/qqmlandroidlinearlayoutparams_p.h>
+#include <QtQmlAndroid/private/qqmlandroidlistview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidnumberpicker_p.h>
+#include <QtQmlAndroid/private/qqmlandroidpopupmenu_p.h>
+#include <QtQmlAndroid/private/qqmlandroidprogressbar_p.h>
+#include <QtQmlAndroid/private/qqmlandroidradiobutton_p.h>
+#include <QtQmlAndroid/private/qqmlandroidradiogroup_p.h>
+#include <QtQmlAndroid/private/qqmlandroidratingbar_p.h>
+#include <QtQmlAndroid/private/qqmlandroidrelativelayout_p.h>
+#include <QtQmlAndroid/private/qqmlandroidrelativelayoutparams_p.h>
+#include <QtQmlAndroid/private/qqmlandroidscrollview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidsearchview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidseekbar_p.h>
+#include <QtQmlAndroid/private/qqmlandroidspace_p.h>
+#include <QtQmlAndroid/private/qqmlandroidspinner_p.h>
+#include <QtQmlAndroid/private/qqmlandroidswitch_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtabhost_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtabspec_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtabwidget_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtextview_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtimepicker_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtoast_p.h>
+#include <QtQmlAndroid/private/qqmlandroidtogglebutton_p.h>
+#include <QtQmlAndroid/private/qqmlandroidviewanimator_p.h>
+#include <QtQmlAndroid/private/qqmlandroidviewflipper_p.h>
+#include <QtQmlAndroid/private/qqmlandroidviewswitcher_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,12 +82,50 @@ class QtQmlAndroidWidgetPlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri)
-    {
-        QtQmlAndroid::registerWidgetModule(uri);
-    }
+    void registerTypes(const char *uri) override;
 };
 
+void QtQmlAndroidWidgetPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQmlAndroidArrayAdapter>(uri, 0, 21, "ArrayAdapter");
+    qmlRegisterType<QQmlAndroidBaseAdapter>();
+    qmlRegisterType<QQmlAndroidButton>(uri, 0, 21, "Button");
+    qmlRegisterType<QQmlAndroidCalendarView>(uri, 0, 21, "CalendarView");
+    qmlRegisterType<QQmlAndroidCheckBox>(uri, 0, 21, "CheckBox");
+    qmlRegisterType<QQmlAndroidDatePicker>(uri, 0, 21, "DatePicker");
+    qmlRegisterType<QQmlAndroidEditText>(uri, 0, 21, "EditText");
+    qmlRegisterType<QQmlAndroidFrameLayout>(uri, 0, 21, "FrameLayout");
+    qmlRegisterType<QQmlAndroidFrameLayoutParams>();
+    qmlRegisterType<QQmlAndroidImageView>(uri, 0, 21, "ImageView");
+    qmlRegisterType<QQmlAndroidLinearLayout>(uri, 0, 21, "LinearLayout");
+    qmlRegisterType<QQmlAndroidLinearLayoutParams>();
+    qmlRegisterType<QQmlAndroidListView>(uri, 0, 21, "ListView");
+    qmlRegisterType<QQmlAndroidNumberPicker>(uri, 0, 21, "NumberPicker");
+    qmlRegisterType<QQmlAndroidPopupMenu>(uri, 0, 21, "PopupMenu");
+    qmlRegisterType<QQmlAndroidProgressBar>(uri, 0, 21, "ProgressBar");
+    qmlRegisterType<QQmlAndroidRadioButton>(uri, 0, 21, "RadioButton");
+    qmlRegisterType<QQmlAndroidRadioGroup>(uri, 0, 21, "RadioGroup");
+    qmlRegisterType<QQmlAndroidRatingBar>(uri, 0, 21, "RatingBar");
+    qmlRegisterType<QQmlAndroidRelativeLayout>(uri, 0, 21, "RelativeLayout");
+    qmlRegisterType<QQmlAndroidRelativeLayoutParams>();
+    qmlRegisterType<QQmlAndroidScrollView>(uri, 0, 21, "ScrollView");
+    qmlRegisterType<QQmlAndroidSearchView>(uri, 0, 21, "SearchView");
+    qmlRegisterType<QQmlAndroidSeekBar>(uri, 0, 21, "SeekBar");
+    qmlRegisterType<QQmlAndroidSpace>(uri, 0, 21, "Space");
+    qmlRegisterType<QQmlAndroidSpinner>(uri, 0, 21, "Spinner");
+    qmlRegisterType<QQmlAndroidSwitch>(uri, 0, 21, "Switch");
+    qmlRegisterType<QQmlAndroidTabHost>(uri, 0, 21, "TabHost");
+    qmlRegisterUncreatableType<QQmlAndroidTabSpec>(uri, 0, 21, "TabSpec", QStringLiteral("TabSpec is an attached property"));
+    qmlRegisterType<QQmlAndroidTabWidget>(uri, 0, 21, "TabWidget");
+    qmlRegisterType<QQmlAndroidTextView>(uri, 0, 21, "TextView");
+    qmlRegisterType<QQmlAndroidTimePicker>(uri, 0, 21, "TimePicker");
+    qmlRegisterType<QQmlAndroidToast>(uri, 0, 21, "Toast");
+    qmlRegisterType<QQmlAndroidToggleButton>(uri, 0, 21, "ToggleButton");
+    qmlRegisterType<QQmlAndroidViewAnimator>(uri, 0, 21, "ViewAnimator");
+    qmlRegisterType<QQmlAndroidViewFlipper>(uri, 0, 21, "ViewFlipper");
+    qmlRegisterType<QQmlAndroidViewSwitcher>(uri, 0, 21, "ViewSwitcher");
+}
+
 QT_END_NAMESPACE
 
 #include "qtqmlandroidwidgetplugin.moc"
diff --git a/src/qmlandroid/app/app.pri b/src/qmlandroid/app/app.pri
index 11105a7..f7951c0 100644
--- a/src/qmlandroid/app/app.pri
+++ b/src/qmlandroid/app/app.pri
@@ -5,13 +5,11 @@ HEADERS += \
     $$PWD/qqmlandroidactivity_p.h \
     $$PWD/qqmlandroidalertdialog_p.h \
     $$PWD/qqmlandroiddialog_p.h \
-    $$PWD/qqmlandroidservice_p.h \
-    $$PWD/qtqmlandroidappmodule_p.h
+    $$PWD/qqmlandroidservice_p.h
 
 SOURCES += \
     $$PWD/qqmlandroidactionbar.cpp \
     $$PWD/qqmlandroidactivity.cpp \
     $$PWD/qqmlandroidalertdialog.cpp \
     $$PWD/qqmlandroiddialog.cpp \
-    $$PWD/qqmlandroidservice.cpp \
-    $$PWD/qtqmlandroidappmodule.cpp
+    $$PWD/qqmlandroidservice.cpp
diff --git a/src/qmlandroid/app/qtqmlandroidappmodule.cpp b/src/qmlandroid/app/qtqmlandroidappmodule.cpp
deleted file mode 100644
index ace291f..0000000
--- a/src/qmlandroid/app/qtqmlandroidappmodule.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidappmodule_p.h"
-
-#include "qqmlandroidactionbar_p.h"
-#include "qqmlandroidactivity_p.h"
-#include "qqmlandroidalertdialog_p.h"
-#include "qqmlandroiddialog_p.h"
-#include "qqmlandroidservice_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerAppModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidActionBar>(uri, 0, 21, "ActionBar");
-    qmlRegisterType<QQmlAndroidActivity>(uri, 0, 21, "Activity");
-    qmlRegisterType<QQmlAndroidAlertDialog>(uri, 0, 21, "AlertDialog");
-    qmlRegisterType<QQmlAndroidDialog>(uri, 0, 21, "Dialog");
-    qmlRegisterType<QQmlAndroidService>(uri, 0, 21, "Service");
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroidappmodule_p.h b/src/qmlandroid/app/qtqmlandroidappmodule_p.h
deleted file mode 100644
index 79944f7..0000000
--- a/src/qmlandroid/app/qtqmlandroidappmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDAPPMODULE_P_H
-#define QTQMLANDROIDAPPMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerAppModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDAPPMODULE_P_H
diff --git a/src/qmlandroid/content/content.pri b/src/qmlandroid/content/content.pri
index 3570e4a..6a48b09 100644
--- a/src/qmlandroid/content/content.pri
+++ b/src/qmlandroid/content/content.pri
@@ -3,11 +3,9 @@ INCLUDEPATH += $$PWD
 HEADERS += \
     $$PWD/qqmlandroidcontext_p.h \
     $$PWD/qqmlandroidcontextual_p.h \
-    $$PWD/qqmlandroidcontextwrapper_p.h \
-    $$PWD/qtqmlandroidcontentmodule_p.h
+    $$PWD/qqmlandroidcontextwrapper_p.h
 
 SOURCES += \
     $$PWD/qqmlandroidcontext.cpp \
     $$PWD/qqmlandroidcontextual.cpp \
-    $$PWD/qqmlandroidcontextwrapper.cpp \
-    $$PWD/qtqmlandroidcontentmodule.cpp
+    $$PWD/qqmlandroidcontextwrapper.cpp
diff --git a/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp b/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
deleted file mode 100644
index 757a744..0000000
--- a/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidcontentmodule_p.h"
-
-#include "qqmlandroidcontext_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerContentModule(const char *uri)
-{
-    qmlRegisterUncreatableType<QQmlAndroidContext>(uri, 0, 21, "Context", QStringLiteral("Cannot create Context"));
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/content/qtqmlandroidcontentmodule_p.h b/src/qmlandroid/content/qtqmlandroidcontentmodule_p.h
deleted file mode 100644
index cd1535e..0000000
--- a/src/qmlandroid/content/qtqmlandroidcontentmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDCONTENTMODULE_P_H
-#define QTQMLANDROIDCONTENTMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerContentModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDCONTENTMODULE_P_H
diff --git a/src/qmlandroid/graphics/drawable/drawable.pri b/src/qmlandroid/graphics/drawable/drawable.pri
index 1960e87..6c04e80 100644
--- a/src/qmlandroid/graphics/drawable/drawable.pri
+++ b/src/qmlandroid/graphics/drawable/drawable.pri
@@ -2,10 +2,8 @@ INCLUDEPATH += $$PWD
 
 HEADERS += \
     $$PWD/qqmlandroidcolordrawable_p.h \
-    $$PWD/qqmlandroiddrawable_p.h \
-    $$PWD/qtqmlandroiddrawablemodule_p.h
+    $$PWD/qqmlandroiddrawable_p.h
 
 SOURCES += \
     $$PWD/qqmlandroidcolordrawable.cpp \
-    $$PWD/qqmlandroiddrawable.cpp \
-    $$PWD/qtqmlandroiddrawablemodule.cpp
+    $$PWD/qqmlandroiddrawable.cpp
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
deleted file mode 100644
index f0a67d5..0000000
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroiddrawablemodule_p.h"
-
-#include "qqmlandroidcolordrawable_p.h"
-#include "qqmlandroiddrawable_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerDrawableModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidColorDrawable>(uri, 0, 21, "ColorDrawable");
-    qmlRegisterType<QQmlAndroidDrawable>(uri, 0, 21, "Drawable");
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule_p.h b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule_p.h
deleted file mode 100644
index 6f183a8..0000000
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDDRAWABLEMODULE_P_H
-#define QQMLANDROIDDRAWABLEMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerDrawableModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDDRAWABLEMODULE_P_H
diff --git a/src/qmlandroid/graphics/graphics.pri b/src/qmlandroid/graphics/graphics.pri
index 280aa37..7061563 100644
--- a/src/qmlandroid/graphics/graphics.pri
+++ b/src/qmlandroid/graphics/graphics.pri
@@ -1,11 +1,9 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidcolor_p.h \
-    $$PWD/qtqmlandroidgraphicsmodule_p.h
+    $$PWD/qqmlandroidcolor_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidcolor.cpp \
-    $$PWD/qtqmlandroidgraphicsmodule.cpp
+    $$PWD/qqmlandroidcolor.cpp
 
 include(drawable/drawable.pri)
diff --git a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp b/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
deleted file mode 100644
index dc29652..0000000
--- a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidgraphicsmodule_p.h"
-
-#include "qqmlandroidcolor_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerGraphicsModule(const char *uri)
-{
-    qmlRegisterSingletonType<QQmlAndroidColor>(uri, 0, 21, "Color", QQmlAndroidColor::provider);
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule_p.h b/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule_p.h
deleted file mode 100644
index 93e9ebd..0000000
--- a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDGRAPHICSMODULE_P_H
-#define QTQMLANDROIDGRAPHICSMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerGraphicsModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDGRAPHICSMODULE_P_H
diff --git a/src/qmlandroid/qmlandroid.pri b/src/qmlandroid/qmlandroid.pri
index e58634a..d7ecc31 100644
--- a/src/qmlandroid/qmlandroid.pri
+++ b/src/qmlandroid/qmlandroid.pri
@@ -1,12 +1,10 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidr_p.h \
-    $$PWD/qtqmlandroidmodule_p.h
+    $$PWD/qqmlandroidr_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidr.cpp \
-    $$PWD/qtqmlandroidmodule.cpp
+    $$PWD/qqmlandroidr.cpp
 
 include(app/app.pri)
 include(core/core.pri)
diff --git a/src/qmlandroid/qtqmlandroidmodule.cpp b/src/qmlandroid/qtqmlandroidmodule.cpp
deleted file mode 100644
index 10a86f4..0000000
--- a/src/qmlandroid/qtqmlandroidmodule.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidmodule_p.h"
-
-#include "qqmlandroidr_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerAndroidModule(const char *uri)
-{
-    qmlRegisterSingletonType<QQmlAndroidR>(uri, 0, 21, "R", QQmlAndroidR::provider);
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/qtqmlandroidmodule_p.h b/src/qmlandroid/qtqmlandroidmodule_p.h
deleted file mode 100644
index 2a52985..0000000
--- a/src/qmlandroid/qtqmlandroidmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDMODULE_P_H
-#define QTQMLANDROIDMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerAndroidModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDMODULE_P_H
diff --git a/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp b/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
deleted file mode 100644
index 82559b3..0000000
--- a/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidsupportmodule_p.h"
-
-#include "qqmlandroiddrawerlayout_p.h"
-#include "qqmlandroidswiperefreshlayout_p.h"
-
-#include "qqmlandroidactionbardrawertoggle_p.h"
-
-#include "qqmlandroidcardview_p.h"
-#include "qqmlandroidrecycleradapter_p.h"
-#include "qqmlandroidrecyclerview_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerSupportV4WidgetModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidDrawerLayout>(uri, 0, 21, "DrawerLayout");
-    qmlRegisterType<QQmlAndroidSwipeRefreshLayout>(uri, 0, 21, "SwipeRefreshLayout");
-}
-
-void registerSupportV7AppModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidActionBarDrawerToggle>(uri, 0, 21, "ActionBarDrawerToggle");
-}
-
-void registerSupportV7WidgetModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidCardView>(uri, 0, 21, "CardView");
-    qmlRegisterType<QQmlAndroidRecyclerAdapter>(uri, 0, 21, "RecyclerAdapter");
-    qmlRegisterType<QQmlAndroidRecyclerView>(uri, 0, 21, "RecyclerView");
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/support/qtqmlandroidsupportmodule_p.h b/src/qmlandroid/support/qtqmlandroidsupportmodule_p.h
deleted file mode 100644
index fe9a7e1..0000000
--- a/src/qmlandroid/support/qtqmlandroidsupportmodule_p.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDSUPPORTMODULE_P_H
-#define QTQMLANDROIDSUPPORTMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerSupportV4WidgetModule(const char *uri);
-    Q_QMLANDROID_EXPORT void registerSupportV7AppModule(const char *uri);
-    Q_QMLANDROID_EXPORT void registerSupportV7WidgetModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDSUPPORTMODULE_P_H
diff --git a/src/qmlandroid/support/support.pri b/src/qmlandroid/support/support.pri
index c49bafe..6c62701 100644
--- a/src/qmlandroid/support/support.pri
+++ b/src/qmlandroid/support/support.pri
@@ -1,10 +1,2 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/qtqmlandroidsupportmodule_p.h
-
-SOURCES += \
-    $$PWD/qtqmlandroidsupportmodule.cpp
-
 include(v4/v4.pri)
 include(v7/v7.pri)
diff --git a/src/qmlandroid/view/animation/animation.pri b/src/qmlandroid/view/animation/animation.pri
index 6b0caee..0a90fd9 100644
--- a/src/qmlandroid/view/animation/animation.pri
+++ b/src/qmlandroid/view/animation/animation.pri
@@ -17,8 +17,7 @@ HEADERS += \
     $$PWD/qqmlandroidpathinterpolator_p.h \
     $$PWD/qqmlandroidrotateanimation_p.h \
     $$PWD/qqmlandroidscaleanimation_p.h \
-    $$PWD/qqmlandroidtranslateanimation_p.h \
-    $$PWD/qtqmlandroidanimationmodule_p.h
+    $$PWD/qqmlandroidtranslateanimation_p.h
 
 SOURCES += \
     $$PWD/qqmlandroidacceleratedecelerateinterpolator.cpp \
@@ -37,5 +36,4 @@ SOURCES += \
     $$PWD/qqmlandroidpathinterpolator.cpp \
     $$PWD/qqmlandroidrotateanimation.cpp \
     $$PWD/qqmlandroidscaleanimation.cpp \
-    $$PWD/qqmlandroidtranslateanimation.cpp \
-    $$PWD/qtqmlandroidanimationmodule.cpp
+    $$PWD/qqmlandroidtranslateanimation.cpp
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp b/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
deleted file mode 100644
index fc8d86b..0000000
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidanimationmodule_p.h"
-
-#include "qqmlandroidacceleratedecelerateinterpolator_p.h"
-#include "qqmlandroidaccelerateinterpolator_p.h"
-#include "qqmlandroidalphaanimation_p.h"
-#include "qqmlandroidanimation_p.h"
-#include "qqmlandroidanimationset_p.h"
-#include "qqmlandroidanticipateinterpolator_p.h"
-#include "qqmlandroidanticipateovershootinterpolator_p.h"
-#include "qqmlandroidbounceinterpolator_p.h"
-#include "qqmlandroidcycleinterpolator_p.h"
-#include "qqmlandroiddecelerateinterpolator_p.h"
-#include "qqmlandroidlinearinterpolator_p.h"
-#include "qqmlandroidovershootinterpolator_p.h"
-#include "qqmlandroidpathinterpolator_p.h"
-#include "qqmlandroidrotateanimation_p.h"
-#include "qqmlandroidscaleanimation_p.h"
-#include "qqmlandroidtranslateanimation_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerAnimationModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidAccelerateDecelerateInterpolator>(uri, 0, 21, "AccelerateDecelerateInterpolator");
-    qmlRegisterType<QQmlAndroidAccelerateInterpolator>(uri, 0, 21, "AccelerateInterpolator");
-    qmlRegisterType<QQmlAndroidAlphaAnimation>(uri, 0, 21, "AlphaAnimation");
-    qmlRegisterType<QQmlAndroidAnimation>(uri, 0, 21, "Animation");
-    qmlRegisterType<QQmlAndroidAnimationSet>(uri, 0, 21, "AnimationSet");
-    qmlRegisterType<QQmlAndroidAnticipateInterpolator>(uri, 0, 21, "AnticipateInterpolator");
-    qmlRegisterType<QQmlAndroidAnticipateOvershootInterpolator>(uri, 0, 21, "AnticipateOvershootInterpolator");
-    qmlRegisterType<QQmlAndroidBounceInterpolator>(uri, 0, 21, "BounceInterpolator");
-    qmlRegisterType<QQmlAndroidCycleInterpolator>(uri, 0, 21, "CycleInterpolator");
-    qmlRegisterType<QQmlAndroidDecelerateInterpolator>(uri, 0, 21, "DecelerateInterpolator");
-    qmlRegisterUncreatableType<QQmlAndroidInterpolator>(uri, 0, 21, "Interpolator", QStringLiteral("Interpolator is abstract"));
-    qmlRegisterType<QQmlAndroidLinearInterpolator>(uri, 0, 21, "LinearInterpolator");
-    qmlRegisterType<QQmlAndroidOvershootInterpolator>(uri, 0, 21, "OvershootInterpolator");
-    qmlRegisterType<QQmlAndroidPathInterpolator>(uri, 0, 21, "PathInterpolator");
-    qmlRegisterType<QQmlAndroidRotateAnimation>(uri, 0, 21, "RotateAnimation");
-    qmlRegisterType<QQmlAndroidScaleAnimation>(uri, 0, 21, "ScaleAnimation");
-    qmlRegisterType<QQmlAndroidTranslateAnimation>(uri, 0, 21, "TranslateAnimation");
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule_p.h b/src/qmlandroid/view/animation/qtqmlandroidanimationmodule_p.h
deleted file mode 100644
index 29237a5..0000000
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDANIMATIONMODULE_P_H
-#define QTQMLANDROIDANIMATIONMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerAnimationModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDANIMATIONMODULE_P_H
diff --git a/src/qmlandroid/view/qtqmlandroidviewmodule.cpp b/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
deleted file mode 100644
index 2010b63..0000000
--- a/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidviewmodule_p.h"
-
-#include "qqmlandroidgravity_p.h"
-#include "qqmlandroidlayoutparams_p.h"
-#include "qqmlandroidmenu_p.h"
-#include "qqmlandroidmenuitem_p.h"
-#include "qqmlandroidview_p.h"
-#include "qqmlandroidviewgroup_p.h"
-#include "qqmlandroidwindow_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerViewModule(const char *uri)
-{
-    qmlRegisterUncreatableType<QQmlAndroidGravity>(uri, 0, 21, "Gravity", QStringLiteral("Gravity is an enum"));
-    qmlRegisterUncreatableType<QQmlAndroidLayoutParams>(uri, 0, 21, "Layout", QStringLiteral("Layout is an attached property"));
-    qmlRegisterType<QQmlAndroidMenu>(uri, 0, 21, "Menu");
-    qmlRegisterType<QQmlAndroidMenuItem>(uri, 0, 21, "MenuItem");
-    qmlRegisterType<QQmlAndroidView>(uri, 0, 21, "View");
-    qmlRegisterType<QQmlAndroidViewGroup>(uri, 0, 21, "ViewGroup");
-    qmlRegisterType<QQmlAndroidWindow>();
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidviewmodule_p.h b/src/qmlandroid/view/qtqmlandroidviewmodule_p.h
deleted file mode 100644
index 89f2246..0000000
--- a/src/qmlandroid/view/qtqmlandroidviewmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDVIEWMODULE_P_H
-#define QTQMLANDROIDVIEWMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerViewModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDVIEWMODULE_P_H
diff --git a/src/qmlandroid/view/view.pri b/src/qmlandroid/view/view.pri
index 6705bd5..1647d73 100644
--- a/src/qmlandroid/view/view.pri
+++ b/src/qmlandroid/view/view.pri
@@ -7,8 +7,7 @@ HEADERS += \
     $$PWD/qqmlandroidmenuitem_p.h \
     $$PWD/qqmlandroidview_p.h \
     $$PWD/qqmlandroidviewgroup_p.h \
-    $$PWD/qqmlandroidwindow_p.h \
-    $$PWD/qtqmlandroidviewmodule_p.h
+    $$PWD/qqmlandroidwindow_p.h
 
 SOURCES += \
     $$PWD/qqmlandroidlayoutparams.cpp \
@@ -16,7 +15,6 @@ SOURCES += \
     $$PWD/qqmlandroidmenuitem.cpp \
     $$PWD/qqmlandroidview.cpp \
     $$PWD/qqmlandroidviewgroup.cpp \
-    $$PWD/qqmlandroidwindow.cpp \
-    $$PWD/qtqmlandroidviewmodule.cpp
+    $$PWD/qqmlandroidwindow.cpp
 
 include(animation/animation.pri)
diff --git a/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp b/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
deleted file mode 100644
index 364d7f8..0000000
--- a/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtqmlandroidwidgetmodule_p.h"
-
-#include "qqmlandroidarrayadapter_p.h"
-#include "qqmlandroidbutton_p.h"
-#include "qqmlandroidcalendarview_p.h"
-#include "qqmlandroidcheckbox_p.h"
-#include "qqmlandroiddatepicker_p.h"
-#include "qqmlandroidedittext_p.h"
-#include "qqmlandroidframelayout_p.h"
-#include "qqmlandroidframelayoutparams_p.h"
-#include "qqmlandroidimageview_p.h"
-#include "qqmlandroidlinearlayout_p.h"
-#include "qqmlandroidlinearlayoutparams_p.h"
-#include "qqmlandroidlistview_p.h"
-#include "qqmlandroidnumberpicker_p.h"
-#include "qqmlandroidpopupmenu_p.h"
-#include "qqmlandroidprogressbar_p.h"
-#include "qqmlandroidradiobutton_p.h"
-#include "qqmlandroidradiogroup_p.h"
-#include "qqmlandroidratingbar_p.h"
-#include "qqmlandroidrelativelayout_p.h"
-#include "qqmlandroidrelativelayoutparams_p.h"
-#include "qqmlandroidscrollview_p.h"
-#include "qqmlandroidsearchview_p.h"
-#include "qqmlandroidseekbar_p.h"
-#include "qqmlandroidspace_p.h"
-#include "qqmlandroidspinner_p.h"
-#include "qqmlandroidswitch_p.h"
-#include "qqmlandroidtabhost_p.h"
-#include "qqmlandroidtabspec_p.h"
-#include "qqmlandroidtabwidget_p.h"
-#include "qqmlandroidtextview_p.h"
-#include "qqmlandroidtimepicker_p.h"
-#include "qqmlandroidtoast_p.h"
-#include "qqmlandroidtogglebutton_p.h"
-#include "qqmlandroidviewanimator_p.h"
-#include "qqmlandroidviewflipper_p.h"
-#include "qqmlandroidviewswitcher_p.h"
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid {
-
-void registerWidgetModule(const char *uri)
-{
-    qmlRegisterType<QQmlAndroidArrayAdapter>(uri, 0, 21, "ArrayAdapter");
-    qmlRegisterType<QQmlAndroidBaseAdapter>();
-    qmlRegisterType<QQmlAndroidButton>(uri, 0, 21, "Button");
-    qmlRegisterType<QQmlAndroidCalendarView>(uri, 0, 21, "CalendarView");
-    qmlRegisterType<QQmlAndroidCheckBox>(uri, 0, 21, "CheckBox");
-    qmlRegisterType<QQmlAndroidDatePicker>(uri, 0, 21, "DatePicker");
-    qmlRegisterType<QQmlAndroidEditText>(uri, 0, 21, "EditText");
-    qmlRegisterType<QQmlAndroidFrameLayout>(uri, 0, 21, "FrameLayout");
-    qmlRegisterType<QQmlAndroidFrameLayoutParams>();
-    qmlRegisterType<QQmlAndroidImageView>(uri, 0, 21, "ImageView");
-    qmlRegisterType<QQmlAndroidLinearLayout>(uri, 0, 21, "LinearLayout");
-    qmlRegisterType<QQmlAndroidLinearLayoutParams>();
-    qmlRegisterType<QQmlAndroidListView>(uri, 0, 21, "ListView");
-    qmlRegisterType<QQmlAndroidNumberPicker>(uri, 0, 21, "NumberPicker");
-    qmlRegisterType<QQmlAndroidPopupMenu>(uri, 0, 21, "PopupMenu");
-    qmlRegisterType<QQmlAndroidProgressBar>(uri, 0, 21, "ProgressBar");
-    qmlRegisterType<QQmlAndroidRadioButton>(uri, 0, 21, "RadioButton");
-    qmlRegisterType<QQmlAndroidRadioGroup>(uri, 0, 21, "RadioGroup");
-    qmlRegisterType<QQmlAndroidRatingBar>(uri, 0, 21, "RatingBar");
-    qmlRegisterType<QQmlAndroidRelativeLayout>(uri, 0, 21, "RelativeLayout");
-    qmlRegisterType<QQmlAndroidRelativeLayoutParams>();
-    qmlRegisterType<QQmlAndroidScrollView>(uri, 0, 21, "ScrollView");
-    qmlRegisterType<QQmlAndroidSearchView>(uri, 0, 21, "SearchView");
-    qmlRegisterType<QQmlAndroidSeekBar>(uri, 0, 21, "SeekBar");
-    qmlRegisterType<QQmlAndroidSpace>(uri, 0, 21, "Space");
-    qmlRegisterType<QQmlAndroidSpinner>(uri, 0, 21, "Spinner");
-    qmlRegisterType<QQmlAndroidSwitch>(uri, 0, 21, "Switch");
-    qmlRegisterType<QQmlAndroidTabHost>(uri, 0, 21, "TabHost");
-    qmlRegisterUncreatableType<QQmlAndroidTabSpec>(uri, 0, 21, "TabSpec", QStringLiteral("TabSpec is an attached property"));
-    qmlRegisterType<QQmlAndroidTabWidget>(uri, 0, 21, "TabWidget");
-    qmlRegisterType<QQmlAndroidTextView>(uri, 0, 21, "TextView");
-    qmlRegisterType<QQmlAndroidTimePicker>(uri, 0, 21, "TimePicker");
-    qmlRegisterType<QQmlAndroidToast>(uri, 0, 21, "Toast");
-    qmlRegisterType<QQmlAndroidToggleButton>(uri, 0, 21, "ToggleButton");
-    qmlRegisterType<QQmlAndroidViewAnimator>(uri, 0, 21, "ViewAnimator");
-    qmlRegisterType<QQmlAndroidViewFlipper>(uri, 0, 21, "ViewFlipper");
-    qmlRegisterType<QQmlAndroidViewSwitcher>(uri, 0, 21, "ViewSwitcher");
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidwidgetmodule_p.h b/src/qmlandroid/widget/qtqmlandroidwidgetmodule_p.h
deleted file mode 100644
index 8ee3195..0000000
--- a/src/qmlandroid/widget/qtqmlandroidwidgetmodule_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQMLANDROIDWIDGETMODULE_P_H
-#define QTQMLANDROIDWIDGETMODULE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QtQmlAndroid
-{
-    Q_QMLANDROID_EXPORT void registerWidgetModule(const char *uri);
-}
-
-QT_END_NAMESPACE
-
-#endif // QTQMLANDROIDWIDGETMODULE_P_H
diff --git a/src/qmlandroid/widget/widget.pri b/src/qmlandroid/widget/widget.pri
index 3e25b44..22d5aea 100644
--- a/src/qmlandroid/widget/widget.pri
+++ b/src/qmlandroid/widget/widget.pri
@@ -41,8 +41,7 @@ HEADERS += \
     $$PWD/qqmlandroidtogglebutton_p.h \
     $$PWD/qqmlandroidviewanimator_p.h \
     $$PWD/qqmlandroidviewflipper_p.h \
-    $$PWD/qqmlandroidviewswitcher_p.h \
-    $$PWD/qtqmlandroidwidgetmodule_p.h
+    $$PWD/qqmlandroidviewswitcher_p.h
 
 SOURCES += \
     $$PWD/qqmlandroidabsseekbar.cpp \
@@ -85,5 +84,4 @@ SOURCES += \
     $$PWD/qqmlandroidtogglebutton.cpp \
     $$PWD/qqmlandroidviewanimator.cpp \
     $$PWD/qqmlandroidviewflipper.cpp \
-    $$PWD/qqmlandroidviewswitcher.cpp \
-    $$PWD/qtqmlandroidwidgetmodule.cpp
+    $$PWD/qqmlandroidviewswitcher.cpp