diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-05-23 18:05:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 09:58:56 +0200 |
| commit | 03342a435a88656d64d1445991a4421d244fcb45 (patch) | |
| tree | c70121da638aed1d8ef1240cae8acf5fddf35dff /tests/auto/qml/qqmlengine/data | |
| parent | b89c6459d760e68c629c0d318d2afd494a2a415a (diff) | |
Put basic language types into QtQml import
This import is automatically registered by the engine.
It provides basic language types (Component and QtObject).
Note that the QtQuick import still has these types registered into it,
so this commit doesn't break existing code.
Change-Id: I8ff190f057fc92969020cf8e896da1649ca3069b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmlengine/data')
9 files changed, 41 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.1.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.1.qml new file mode 100644 index 0000000000..e879577e10 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.1.qml @@ -0,0 +1,4 @@ +import QtQml 2.0 + +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.2.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.2.qml new file mode 100644 index 0000000000..6cbe96b1ee --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.2.qml @@ -0,0 +1,4 @@ +import QtQml 3.0 + +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.3.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.3.qml new file mode 100644 index 0000000000..1160c2827c --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.3.qml @@ -0,0 +1,4 @@ +import QtQml 1.0 + +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.4.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.4.qml new file mode 100644 index 0000000000..9b9b7922da --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.4.qml @@ -0,0 +1,4 @@ +import QtQml 2.5 + +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml new file mode 100644 index 0000000000..7a4fe5ed24 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 + +QtObject { + property Component c +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.6.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.6.qml new file mode 100644 index 0000000000..e8cc22fd5b --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.6.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 +import QtQuick 2.0 + +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.7.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.7.qml new file mode 100644 index 0000000000..619489b22e --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.7.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 +import QtQml 2.0 + +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.8.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.8.qml new file mode 100644 index 0000000000..59bf31662c --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.8.qml @@ -0,0 +1,5 @@ +// deliberately no imports + +// should fail +QtObject { +} diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.9.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.9.qml new file mode 100644 index 0000000000..cbf90b9dd1 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.9.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 + +// Should fail. +Item { +} |