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

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

3 files changed, 15 insertions, 4 deletions

diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro
index 22d8ded708..094e5201ca 100644
--- a/examples/qml/referenceexamples/extended/extended.pro
+++ b/examples/qml/referenceexamples/extended/extended.pro
@@ -1,5 +1,9 @@
 QT += qml widgets
 
+CONFIG += qmltypes
+QML_IMPORT_NAME = People
+QML_IMPORT_MAJOR_VERSION = 1
+
 SOURCES += main.cpp \
            lineedit.cpp
 HEADERS += lineedit.h
diff --git a/examples/qml/referenceexamples/extended/lineedit.h b/examples/qml/referenceexamples/extended/lineedit.h
index e8f7d90853..5c315ad5ac 100644
--- a/examples/qml/referenceexamples/extended/lineedit.h
+++ b/examples/qml/referenceexamples/extended/lineedit.h
@@ -51,6 +51,7 @@
 #define LINEEDIT_H
 
 #include <QLineEdit>
+#include <qqml.h>
 
 class LineEditExtension : public QObject
 {
@@ -80,4 +81,14 @@ private:
     QLineEdit *m_lineedit;
 };
 
+// ![0]
+struct QLineEditForeign
+{
+    Q_GADGET
+    QML_FOREIGN(QLineEdit)
+    QML_ELEMENT
+    QML_EXTENDED(LineEditExtension)
+};
+// ![0]
+
 #endif // LINEEDIT_H
diff --git a/examples/qml/referenceexamples/extended/main.cpp b/examples/qml/referenceexamples/extended/main.cpp
index 5f8582d08f..26048d9189 100644
--- a/examples/qml/referenceexamples/extended/main.cpp
+++ b/examples/qml/referenceexamples/extended/main.cpp
@@ -58,10 +58,6 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-// ![0]
-    qmlRegisterExtendedType<QLineEdit, LineEditExtension>("People", 1,0, "QLineEdit");
-// ![0]
-
 // ![1]
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));