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

3 files changed, 13 insertions, 10 deletions

diff --git a/examples/qml/referenceexamples/signal/birthdayparty.h b/examples/qml/referenceexamples/signal/birthdayparty.h
index 9aecc8929c..c815518291 100644
--- a/examples/qml/referenceexamples/signal/birthdayparty.h
+++ b/examples/qml/referenceexamples/signal/birthdayparty.h
@@ -59,6 +59,7 @@ class BirthdayPartyAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
+    QML_ANONYMOUS
 public:
     BirthdayPartyAttached(QObject *object);
 
@@ -75,6 +76,8 @@ class BirthdayParty : public QObject
     Q_PROPERTY(Person *host READ host WRITE setHost)
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
+    QML_ELEMENT
+    QML_ATTACHED(BirthdayPartyAttached)
 public:
     BirthdayParty(QObject *parent = nullptr);
 
@@ -97,6 +100,5 @@ private:
     Person *m_host;
     QList<Person *> m_guests;
 };
-QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // BIRTHDAYPARTY_H
diff --git a/examples/qml/referenceexamples/signal/main.cpp b/examples/qml/referenceexamples/signal/main.cpp
index bb75e02bc2..f431e2bdc8 100644
--- a/examples/qml/referenceexamples/signal/main.cpp
+++ b/examples/qml/referenceexamples/signal/main.cpp
@@ -58,12 +58,8 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
-    qmlRegisterType<BirthdayPartyAttached>();
-    qmlRegisterType<BirthdayParty>("People", 1,0, "BirthdayParty");
-    qmlRegisterType<ShoeDescription>();
-    qmlRegisterType<Person>();
-    qmlRegisterType<Boy>("People", 1,0, "Boy");
-    qmlRegisterType<Girl>("People", 1,0, "Girl");
+    qmlRegisterTypesAndRevisions<BirthdayPartyAttached, BirthdayParty, ShoeDescription,
+                                 Person, Boy, Girl>("People", 1);
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
@@ -93,9 +89,9 @@ int main(int argc, char ** argv)
         }
 
         party->startParty();
-    } else {
-        qWarning() << component.errors();
+        return EXIT_SUCCESS;
     }
 
-    return 0;
+    qWarning() << component.errors();
+    return EXIT_FAILURE;
 }
diff --git a/examples/qml/referenceexamples/signal/person.h b/examples/qml/referenceexamples/signal/person.h
index 06d4f2eb27..7283f39f61 100644
--- a/examples/qml/referenceexamples/signal/person.h
+++ b/examples/qml/referenceexamples/signal/person.h
@@ -52,6 +52,7 @@
 
 #include <QObject>
 #include <QColor>
+#include <QtQml/qqml.h>
 
 class ShoeDescription : public QObject
 {
@@ -60,6 +61,7 @@ class ShoeDescription : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor)
     Q_PROPERTY(QString brand READ brand WRITE setBrand)
     Q_PROPERTY(qreal price READ price WRITE setPrice)
+    QML_ANONYMOUS
 public:
     ShoeDescription(QObject *parent = nullptr);
 
@@ -86,6 +88,7 @@ class Person : public QObject
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(ShoeDescription *shoe READ shoe)
+    QML_ANONYMOUS
 public:
     Person(QObject *parent = nullptr);
 
@@ -101,6 +104,7 @@ private:
 class Boy : public Person
 {
     Q_OBJECT
+    QML_ELEMENT
 public:
     Boy(QObject * parent = nullptr);
 };
@@ -108,6 +112,7 @@ public:
 class Girl : public Person
 {
     Q_OBJECT
+    QML_ELEMENT
 public:
     Girl(QObject * parent = nullptr);
 };