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

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

4 files changed, 6 insertions, 2 deletions

diff --git a/examples/quick/tableview/gameoflife/gameoflifemodel.h b/examples/quick/tableview/gameoflife/gameoflifemodel.h
index 3ea1469861..161e0b2cfc 100644
--- a/examples/quick/tableview/gameoflife/gameoflifemodel.h
+++ b/examples/quick/tableview/gameoflife/gameoflifemodel.h
@@ -54,11 +54,13 @@
 #include <array>
 #include <QAbstractTableModel>
 #include <QPoint>
+#include <QtQml/qqml.h>
 
 //! [modelclass]
 class GameOfLifeModel : public QAbstractTableModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     Q_ENUMS(Roles)
 public:
diff --git a/examples/quick/tableview/gameoflife/main.cpp b/examples/quick/tableview/gameoflife/main.cpp
index 5101880b06..fcea7080ea 100644
--- a/examples/quick/tableview/gameoflife/main.cpp
+++ b/examples/quick/tableview/gameoflife/main.cpp
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
 
     //! [registertype]
-    qmlRegisterType<GameOfLifeModel>("GameOfLifeModel", 1, 0, "GameOfLifeModel");
+    qmlRegisterTypesAndRevisions<GameOfLifeModel>("GameOfLifeModel", 1);
     //! [registertype]
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
diff --git a/examples/quick/tableview/pixelator/imagemodel.h b/examples/quick/tableview/pixelator/imagemodel.h
index bf0ec90da4..de8ad7cd8d 100644
--- a/examples/quick/tableview/pixelator/imagemodel.h
+++ b/examples/quick/tableview/pixelator/imagemodel.h
@@ -53,12 +53,14 @@
 
 #include <QAbstractTableModel>
 #include <QImage>
+#include <QtQml/qqml.h>
 
 //! [model]
 class ImageModel : public QAbstractTableModel
 {
     Q_OBJECT
     Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+    QML_ELEMENT
 public:
     ImageModel(QObject *parent = nullptr);
 
diff --git a/examples/quick/tableview/pixelator/main.cpp b/examples/quick/tableview/pixelator/main.cpp
index c57039556a..a8cb6c4e86 100644
--- a/examples/quick/tableview/pixelator/main.cpp
+++ b/examples/quick/tableview/pixelator/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
 
     //! [registertype]
-    qmlRegisterType<ImageModel>("ImageModel", 1, 0, "ImageModel");
+    qmlRegisterTypesAndRevisions<ImageModel>("ImageModel", 1);
     //! [registertype]
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));