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/quick | |
| 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/quick')
| -rw-r--r-- | src/quick/qtquick2.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickvaluetypes.cpp | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index ed1fa0da6d..ae2d245dd9 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -173,7 +173,7 @@ void QQmlQtQuick2DebugStatesDelegate::resetBindingForInvalidProperty(QObject *ob void QQmlQtQuick2Module::defineModule() { QQuickUtilModule::defineModule(); - QQmlEnginePrivate::defineModule(); + QQmlEnginePrivate::defineQtQuick2Module(); QQuickItemsModule::defineModule(); qmlRegisterUncreatableType<QQuickApplication>("QtQuick",2,0,"Application", QQuickApplication::tr("Application is an abstract class")); diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index 179f840acd..e3da2658b4 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -49,14 +49,11 @@ QT_BEGIN_NAMESPACE namespace QQuickValueTypes { - -void registerValueTypes() -{ - QQmlValueTypeFactory::registerValueTypes(); - - qmlRegisterValueTypeEnums<QQuickFontValueType>("QtQuick", 2, 0, "Font"); -} - + void registerValueTypes() + { + QQmlValueTypeFactory::registerValueTypes("QtQuick", 2, 0); + qmlRegisterValueTypeEnums<QQuickFontValueType>("QtQuick", 2, 0, "Font"); + } } QQuickColorValueType::QQuickColorValueType(QObject *parent) |