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 /src/qml/qml/qqmlvaluetype.cpp | |
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 'src/qml/qml/qqmlvaluetype.cpp')
-rw-r--r-- | src/qml/qml/qqmlvaluetype.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp index b96c2f65a4..c0759a31b4 100644 --- a/src/qml/qml/qqmlvaluetype.cpp +++ b/src/qml/qml/qqmlvaluetype.cpp @@ -72,16 +72,11 @@ bool QQmlValueTypeFactory::isValueType(int idx) return false; } -void QQmlValueTypeFactory::registerBaseTypes(const char *uri, int versionMajor, int versionMinor) +void QQmlValueTypeFactory::registerValueTypes(const char *uri, int versionMajor, int versionMinor) { qmlRegisterValueTypeEnums<QQmlEasingValueType>(uri, versionMajor, versionMinor, "Easing"); } -void QQmlValueTypeFactory::registerValueTypes() -{ - registerBaseTypes("QtQuick", 2, 0); -} - QQmlValueType *QQmlValueTypeFactory::valueType(int t) { QQmlValueType *rv = 0; |