From 03342a435a88656d64d1445991a4421d244fcb45 Mon Sep 17 00:00:00 2001
From: Chris Adams <christopher.adams@nokia.com>
Date: Wed, 23 May 2012 18:05:10 +1000
Subject: 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>
---
 src/quick/qtquick2.cpp              |  2 +-
 src/quick/util/qquickvaluetypes.cpp | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/quick')

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)
-- 
cgit v1.2.3