Add QtQml.Models module

The moved Model classes can now be exposed in a QtQml import.

To keep the QtQml import resticted to more core functionality, they are
being exposed in a plugin module.

Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

3 files changed, 64 insertions, 0 deletions

diff --git a/tests/auto/qml/qtqmlmodules/data/base.qml b/tests/auto/qml/qtqmlmodules/data/base.qml
new file mode 100644
index 0000000000..942b270572
--- /dev/null
+++ b/tests/auto/qml/qtqmlmodules/data/base.qml
@@ -0,0 +1,14 @@
+import QtQml 2.0
+
+QtObject {
+    property bool success: {
+        prop1 != undefined &&
+        prop2 != undefined &&
+        prop3 != undefined &&
+        prop4 != undefined
+    }
+    property Component prop1: Component { QtObject {}}
+    property Timer prop2: Timer {}
+    property Connections prop3: Connections{}
+    property Binding prop4: Binding{}
+}
diff --git a/tests/auto/qml/qtqmlmodules/data/models.qml b/tests/auto/qml/qtqmlmodules/data/models.qml
new file mode 100644
index 0000000000..d253565932
--- /dev/null
+++ b/tests/auto/qml/qtqmlmodules/data/models.qml
@@ -0,0 +1,15 @@
+import QtQml 2.0
+import QtQml.Models 2.1
+
+QtObject {
+    property bool success: {
+        prop1 != undefined &&
+        prop2 != undefined &&
+        prop3 != undefined &&
+        prop4 != undefined
+    }
+    property DelegateModelGroup prop1: DelegateModelGroup{}
+    property DelegateModel prop2: DelegateModel{}
+    property ObjectModel prop3: ObjectModel{}
+    property ListModel prop4: ListModel{ListElement{dummy: true}}
+}
diff --git a/tests/auto/qml/qtqmlmodules/data/unavailable.qml b/tests/auto/qml/qtqmlmodules/data/unavailable.qml
new file mode 100644
index 0000000000..5841e3f677
--- /dev/null
+++ b/tests/auto/qml/qtqmlmodules/data/unavailable.qml
@@ -0,0 +1,35 @@
+import QtQml 2.0
+
+QtObject {
+    id: root
+    property bool success: false;
+    Component.onCompleted: {
+        var strings = [
+            "QtObject{}",
+            "Binding{}",
+            "Connections{}",
+            "Timer{}",
+            "Component{QtObject{}}",
+            "ListModel{ListElement{}}",
+            "ObjectModel{QtObject{}}",
+            "import QtQml 2.0 Item{}",
+            "import QtQml 2.0 ListModel{}",
+            "import QtQml 2.0 ObjectModel{}"
+        ];
+        var idx;
+        for (idx in strings) {
+            var errored = false;
+            var item;
+            try {
+                item = Qt.createQmlObject(strings[idx], root);
+            } catch (err) {
+                errored = true;
+            }
+            if (!errored) {
+                console.log("It worked? ", item);
+                return;
+            }
+        }
+        root.success = true;
+    }
+}