From d1a83a3e6cd4bca38c4299c027d99a9631da388b Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Tue, 21 Jun 2011 13:56:11 +0200
Subject: [PATCH] QmlJS: Add qsTr and friends to code model.
Change-Id: I9a16549da341500fc273ebbc480d7aa901b17e41
Reviewed-on: http://codereview.qt.nokia.com/548
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
---
src/libs/qmljs/qmljsinterpreter.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 7ab371824cc..5d53ce415dd 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -2598,16 +2598,21 @@ void Engine::initializePrototypes()
addFunction(_qtObject, QLatin1String("size"), 2);
addFunction(_qtObject, QLatin1String("tint"), 2);
addFunction(_qtObject, QLatin1String("vector3d"), 3);
+ _globalObject->setMember(QLatin1String("Qt"), _qtObject);
-
- //firebug/webkit compat
+ // firebug/webkit compat
ObjectValue *consoleObject = newObject(/*prototype */ 0);
addFunction(consoleObject, QLatin1String("log"), 1);
addFunction(consoleObject, QLatin1String("debug"), 1);
-
_globalObject->setMember(QLatin1String("console"), consoleObject);
- _globalObject->setMember(QLatin1String("Qt"), _qtObject);
+ // translation functions
+ addFunction(_globalObject, QLatin1String("qsTr"), 3);
+ addFunction(_globalObject, QLatin1String("QT_TR_NOOP"), 1);
+ addFunction(_globalObject, QLatin1String("qsTranslate"), 5);
+ addFunction(_globalObject, QLatin1String("QT_TRANSLATE_NOOP"), 2);
+ addFunction(_globalObject, QLatin1String("qsTrId"), 2);
+ addFunction(_globalObject, QLatin1String("QT_TRID_NOOP"), 1);
// QML objects
_qmlFontObject = newObject(/*prototype =*/ 0);
--
GitLab