Move QML type registration to the QML plugins

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

1 files changed, 9 insertions, 5 deletions

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"