Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

3 files changed, 5 insertions, 9 deletions

diff --git a/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc b/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc
index 9e199a5347..88b28769cd 100644
--- a/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc
+++ b/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc
@@ -42,6 +42,7 @@
     TableView.
     We use the \l{The Property System}{Qt Property System} and a source property
     as \c QString to set the path of the image.
+    We also add the QML_ELEMENT macro to expose the model to QML.
 
     \snippet tableview/pixelator/imagemodel.cpp setsource
 
@@ -59,11 +60,6 @@
     When we call this function with the display role, we return the pixel's
     gray value.
 
-    \snippet tableview/pixelator/main.cpp registertype
-
-    We need to register our model in the QML type system to be able to use it
-    from the QML side.
-
     \snippet tableview/pixelator/main.qml pixelcomponent
 
     Each pixel in the \c TableView is displayed via a delegate component.
diff --git a/examples/quick/tableview/pixelator/main.cpp b/examples/quick/tableview/pixelator/main.cpp
index a8cb6c4e86..c07f43dc27 100644
--- a/examples/quick/tableview/pixelator/main.cpp
+++ b/examples/quick/tableview/pixelator/main.cpp
@@ -59,10 +59,6 @@ int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
 
-    //! [registertype]
-    qmlRegisterTypesAndRevisions<ImageModel>("ImageModel", 1);
-    //! [registertype]
-
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())
         return -1;
diff --git a/examples/quick/tableview/pixelator/pixelator.pro b/examples/quick/tableview/pixelator/pixelator.pro
index a34456ff0b..188f55ebc3 100644
--- a/examples/quick/tableview/pixelator/pixelator.pro
+++ b/examples/quick/tableview/pixelator/pixelator.pro
@@ -6,6 +6,10 @@ HEADERS += imagemodel.h
 SOURCES += main.cpp \
         imagemodel.cpp
 
+CONFIG += qmltypes
+QML_IMPORT_NAME = ImageModel
+QML_IMPORT_MAJOR_VERSION = 1
+
 RESOURCES += qt.png main.qml
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/tableview/pixelator