Doc: Fix extension plugin examples and documentation

We advertise the usage of QQmlEngineExtensionPlugin, as registerTypes()
should be avoided if possible. The actual source code of the examples
already does this, but some of the includes and the documentation was
lagging.

Task-number: QTBUG-81615
Change-Id: Ibbee60ad55114bf6dc07875080c963e727f49e6b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

5 files changed, 30 insertions, 27 deletions

diff --git a/examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc b/examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
index 9e0bbb1815..24d6991d52 100644
--- a/examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
+++ b/examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
@@ -29,7 +29,7 @@
     \title QML Plugin Example
     \example qmlextensionplugins
 
-    \brief This example creates a C++ plugin extension by subclassing QQmlExtensionPlugin.
+    \brief This example creates a C++ plugin extension by subclassing QQmlEngineExtensionPlugin.
 
     \image qml-plugins-example.png
 
diff --git a/examples/qml/qmlextensionplugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp
index 99d8c5378c..ae5f35bf5f 100644
--- a/examples/qml/qmlextensionplugins/plugin.cpp
+++ b/examples/qml/qmlextensionplugins/plugin.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtQml/QQmlExtensionPlugin>
+#include <QtQml/QQmlEngineExtensionPlugin>
 #include <qdebug.h>
 
 //![plugin]
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
index 0b1cfcc8f1..780bb3a8f3 100644
--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
+++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
@@ -51,7 +51,7 @@
 #define CHARTSPLUGIN_H
 
 //![0]
-#include <QQmlExtensionPlugin>
+#include <QQmlEngineExtensionPlugin>
 
 class ChartsPlugin : public QQmlEngineExtensionPlugin
 {
diff --git a/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h b/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
index 972859f80e..4abf2cf3dc 100644
--- a/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
+++ b/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QQmlExtensionPlugin>
+#include <QQmlEngineExtensionPlugin>
 
 #include "../textballoon.h"
 
diff --git a/src/qml/doc/src/qmllanguageref/modules/qqmlextensionplugin.qdocinc b/src/qml/doc/src/qmllanguageref/modules/qqmlextensionplugin.qdocinc
index 05447db627..496245820a 100644
--- a/src/qml/doc/src/qmllanguageref/modules/qqmlextensionplugin.qdocinc
+++ b/src/qml/doc/src/qmllanguageref/modules/qqmlextensionplugin.qdocinc
@@ -1,19 +1,22 @@
-QQmlExtensionPlugin is a plugin interface that makes it possible to
+\l QQmlEngineExtensionPlugin is a plugin interface that makes it possible to
 create QML extensions that can be loaded dynamically into QML applications.
 These extensions allow custom QML types to be made available to the
 QML engine.
 
 To write a QML extension plugin:
 \list 1
-\li Subclass QQmlExtensionPlugin
+\li Subclass \l QQmlEngineExtensionPlugin and use the Q_PLUGIN_METADATA() macro
+    to register the plugin with the Qt meta object system.
+\li Use the \l QML_ELEMENT and \l QML_NAMED_ELEMENT() macros to declare
+    QML types.
+\li Write a project file for the plugin. Add:
     \list
-        \li Use the Q_PLUGIN_METADATA() macro to register the plugin with
-            the Qt meta object system
-        \li Override the \l{QQmlExtensionPlugin::}{registerTypes()} method
-            and call qmlRegisterType() to register the types to be exported
-            by the plugin
+        \li \c {CONFIG += qmltypes} to instruct the build system to generate
+            QML types.
+        \li \c {QML_IMPORT_NAME = <my.import.name>} to specify the import name.
+        \li \c {QML_IMPORT_MAJOR_VERSION = <version>} to specify the import
+            major version.
     \endlist
-\li Write a project file for the plugin
 \li Create a \l{Module Definition qmldir Files}{qmldir file} to
     describe the plugin
 \endlist
@@ -27,26 +30,18 @@ issues in the library user's code.
 
 Suppose there is a new \c TimeModel C++ class that should be made available
 as a new QML type. It provides the current time through \c hour and \c minute
-properties.
+properties. It declares a QML type called \c Time via \l QML_NAMED_ELEMENT().
 
 \snippet qmlextensionplugins/timemodel.h 0
 \dots
 
 To make this type available, we create a plugin class named \c QExampleQmlPlugin
-which is a subclass of \l QQmlExtensionPlugin. It overrides the
-\l{QQmlExtensionPlugin::}{registerTypes()} method in order to register the \c TimeModel
-type using qmlRegisterType(). It also uses the Q_PLUGIN_METADATA() macro in the class
-definition to register the plugin with the Qt meta object system using a unique
-identifier for the plugin.
+which is a subclass of \l QQmlEngineExtensionPlugin. It uses the
+Q_PLUGIN_METADATA() macro in the class definition to register the plugin with the
+Qt meta object system using a unique identifier for the plugin.
 
 \snippet qmlextensionplugins/plugin.cpp plugin
 
-This registers the \c TimeModel class with version \c{1.0} of this plugin library, as
-a QML type called \c Time. The Q_ASSERT() macro can ensure the type namespace is
-imported correctly by any QML components that use this plugin. The
-\l{Defining QML Types from C++} article has more information about registering C++
-types into the runtime.
-
 \section1 Project settings for the plugin
 
 Additionally, the project file (\c .pro) defines the project as a plugin library,
@@ -55,14 +50,22 @@ the plugin target name and various other details:
 
 \code
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += qt plugin qmltypes
 QT += qml
 
-DESTDIR = imports/TimeExample
-TARGET = qmlqtimeexampleplugin
+QML_IMPORT_NAME = TimeExample
+QML_IMPORT_MAJOR_VERSION = 1
+
+DESTDIR = imports/$$QML_IMPORT_NAME
+TARGET  = qmlqtimeexampleplugin
+
 SOURCES += qexampleqmlplugin.cpp
 \endcode
 
+This registers the \c TimeModel class with the import \c{TimeExample 1.0}, as
+a QML type called \c Time. The \l{Defining QML Types from C++} article has more
+information about registering C++ types for usage in QML.
+
 \section1 Plugin definition in the qmldir
 
 Finally, a \l{Module Definition qmldir Files}{qmldir file} is required