Put basic language types into QtQml import
authorChris Adams <christopher.adams@nokia.com>
Wed, 23 May 2012 08:05:10 +0000 (18:05 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 21 Jun 2012 07:58:56 +0000 (09:58 +0200)
commit03342a435a88656d64d1445991a4421d244fcb45
treec70121da638aed1d8ef1240cae8acf5fddf35dff
parentb89c6459d760e68c629c0d318d2afd494a2a415a
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>
16 files changed:
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlengine_p.h
src/qml/qml/qqmlvaluetype.cpp
src/qml/qml/qqmlvaluetype_p.h
src/quick/qtquick2.cpp
src/quick/util/qquickvaluetypes.cpp
tests/auto/qml/qqmlengine/data/qtqmlModule.1.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.2.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.3.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.4.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.6.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.7.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.8.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/data/qtqmlModule.9.qml [new file with mode: 0644]
tests/auto/qml/qqmlengine/tst_qqmlengine.cpp