From 8bc51b89a1d71ca9c6b1595ce497e0d91e9d2634 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 17 Feb 2020 13:38:12 +0100
Subject: 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>
---
 examples/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc               | 2 +-
 examples/qml/qmlextensionplugins/plugin.cpp                             | 2 +-
 .../qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples/qml')

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
 {
-- 
cgit v1.2.3