diff options
author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 04:21:49 +0900 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 18:47:20 +0100 |
commit | cedaf867421f4c43a2da712f00e9626e64c8b250 (patch) | |
tree | 6337786b200cb9e198531456439719de5187827e /src/qml/qml/v8 | |
parent | 31151e232eeeefa929796580a489b9bd851590bb (diff) |
Enable mobule build with QT_NO_TRANSLATION
Change-Id: Id7aeef0d499f48ddc64b4ea3e4dc713db8458c38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 3 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index c4352de9e9..8e8e320724 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1328,6 +1328,7 @@ v8::Handle<v8::Value> createComponent(const v8::Arguments &args) return v8engine->newQObject(c); } +#ifndef QT_NO_TRANSLATION /*! \qmlmethod string qsTranslate(string context, string sourceText, string disambiguation, int n) @@ -1556,7 +1557,7 @@ v8::Handle<v8::Value> qsTrIdNoOp(const v8::Arguments &args) return v8::Undefined(); return args[0]; } - +#endif // QT_NO_TRANSLATION /*! \qmlmethod Qt::locale(name) diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index 08e7d4fd75..de171bb901 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -100,12 +100,14 @@ v8::Handle<v8::Value> quit(const v8::Arguments &args); v8::Handle<v8::Value> resolvedUrl(const v8::Arguments &args); v8::Handle<v8::Value> createQmlObject(const v8::Arguments &args); v8::Handle<v8::Value> createComponent(const v8::Arguments &args); +#ifndef QT_NO_TRANSLATION v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args); v8::Handle<v8::Value> qsTranslateNoOp(const v8::Arguments &args); v8::Handle<v8::Value> qsTr(const v8::Arguments &args); v8::Handle<v8::Value> qsTrNoOp(const v8::Arguments &args); v8::Handle<v8::Value> qsTrId(const v8::Arguments &args); v8::Handle<v8::Value> qsTrIdNoOp(const v8::Arguments &args); +#endif v8::Handle<v8::Value> stringArg(const v8::Arguments &args); v8::Handle<v8::Value> locale(const v8::Arguments &args); v8::Handle<v8::Value> binding(const v8::Arguments &args); diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 19aea297d3..030cfda484 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -640,12 +640,14 @@ void QV8Engine::initializeGlobal(v8::Handle<v8::Object> global) qt->Set(v8::String::New("createComponent"), V8FUNCTION(createComponent, this)); } +#ifndef QT_NO_TRANSLATION global->Set(v8::String::New("qsTranslate"), V8FUNCTION(qsTranslate, this)); global->Set(v8::String::New("QT_TRANSLATE_NOOP"), V8FUNCTION(qsTranslateNoOp, this)); global->Set(v8::String::New("qsTr"), V8FUNCTION(qsTr, this)); global->Set(v8::String::New("QT_TR_NOOP"), V8FUNCTION(qsTrNoOp, this)); global->Set(v8::String::New("qsTrId"), V8FUNCTION(qsTrId, this)); global->Set(v8::String::New("QT_TRID_NOOP"), V8FUNCTION(qsTrIdNoOp, this)); +#endif global->Set(v8::String::New("print"), consoleLogFn); global->Set(v8::String::New("console"), console); |