summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-12-02 00:18:42 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-12-02 00:18:42 (GMT)
commitf2cb650fd28d8bb67666de409f26807a2cf1d852 (patch)
tree8968c8e9bbea74368c63be4e5cf1dbd00f647f6f /src
parent9a747225bba0d645868ef32391f1bed74376ff2c (diff)
parenta2420e0650b23aad5daf4f146722d54aa649c77f (diff)
downloadQt-f2cb650fd28d8bb67666de409f26807a2cf1d852.zip
Qt-f2cb650fd28d8bb67666de409f26807a2cf1d852.tar.gz
Qt-f2cb650fd28d8bb67666de409f26807a2cf1d852.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qmlengine.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 864d07e..92a6bd9 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -160,6 +160,10 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
scriptEngine.globalObject().setProperty(QLatin1String("createComponent"),
scriptEngine.newFunction(QmlEnginePrivate::createComponent, 1));
+ // translation functions need to be installed
+ // before the global script class is constructed (QTBUG-6437)
+ scriptEngine.installTranslatorFunctions();
+
globalClass = new QmlGlobalScriptClass(&scriptEngine);
}
@@ -227,7 +231,6 @@ void QmlEnginePrivate::init()
qRegisterMetaType<QVariant>("QVariant");
qRegisterMetaType<QmlScriptString>("QmlScriptString");
- scriptEngine.installTranslatorFunctions();
contextClass = new QmlContextScriptClass(q);
objectClass = new QmlObjectScriptClass(q);
valueTypeClass = new QmlValueTypeScriptClass(q);