Q_ASSERT(binding->bindingReference);
const BindingReference &ref = *binding->bindingReference;
+#ifndef QT_NO_TRANSLATION
if (ref.dataType == BindingReference::TrId) {
const TrBindingReference &tr = static_cast<const TrBindingReference &>(ref);
store.comment = output->indexForByteArray(tr.comment.toUtf8());
store.n = tr.n;
output->addInstruction(store);
- } else if (ref.dataType == BindingReference::V4) {
+ } else
+#endif
+ if (ref.dataType == BindingReference::V4) {
const JSBindingReference &js = static_cast<const JSBindingReference &>(ref);
Instruction::StoreV4Binding store;
case QQmlInstruction::StoreStringQList:
qWarning().nospace() << idx << "\t\t" << "STORE_STRING_QLIST\t\t" << instr->storeString.propertyIndex << "\t" << instr->storeString.value << "\t\t" << primitives.at(instr->storeString.value);
break;
+#ifndef QT_NO_TRANSLATION
case QQmlInstruction::StoreTrString:
qWarning().nospace() << idx << "\t\t" << "STORE_TR_STRING\t" << instr->storeTrString.propertyIndex << "\t" << instr->storeTrString.context << "\t" << instr->storeTrString.text << "\t" << instr->storeTrString.comment << "\t" << instr->storeTrString.n;
break;
case QQmlInstruction::StoreTrIdString:
qWarning().nospace() << idx << "\t\t" << "STORE_TRID_STRING\t" << instr->storeTrIdString.propertyIndex << "\t" << instr->storeTrIdString.text << "\t" << instr->storeTrIdString.n;
break;
+#endif
case QQmlInstruction::StoreByteArray:
qWarning().nospace() << idx << "\t\t" << "STORE_BYTEARRAY" << instr->storeByteArray.propertyIndex << "\t" << instr->storeByteArray.value << "\t\t" << datas.at(instr->storeByteArray.value);
break;
F(StoreJSValueBool, storeBool) \
F(StoreStringList, storeString) \
F(StoreStringQList, storeString) \
- F(StoreTrString, storeTrString) \
- F(StoreTrIdString, storeTrIdString) \
+ F_TRANSLATION(F, StoreTrString, storeTrString) \
+ F_TRANSLATION(F, StoreTrIdString, storeTrIdString) \
F(StoreByteArray, storeByteArray) \
F(StoreUrl, storeUrl) \
F(StoreUrlQList, storeUrl) \
F(FetchValueType, fetchValue) \
F(PopValueType, fetchValue)
+#ifndef QT_NO_TRANSLATION
+#define F_TRANSLATION(F, I, FMT) F(I, FMT)
+#else
+#define F_TRANSLATION(F, I, FMT)
+#endif
+
#if defined(Q_CC_GNU) && (!defined(Q_CC_INTEL) || __INTEL_COMPILER >= 1200)
# define QML_THREADED_VME_INTERPRETER
#endif
QML_STORE_POINTER(StoreString, &PRIMITIVES.at(instr.value));
QML_STORE_POINTER(StoreByteArray, &DATAS.at(instr.value));
QML_STORE_POINTER(StoreUrl, &URLS.at(instr.value));
+#ifndef QT_NO_TRANSLATION
QML_STORE_VALUE(StoreTrString, QString,
QCoreApplication::translate(DATAS.at(instr.context).constData(),
DATAS.at(instr.text).constData(),
DATAS.at(instr.comment).constData(),
instr.n));
QML_STORE_VALUE(StoreTrIdString, QString, qtTrId(DATAS.at(instr.text).constData(), instr.n));
+#endif
// Store a literal value in a QList
QML_STORE_LIST(StoreStringList, QStringList, PRIMITIVES.at(instr.value));
return v8engine->newQObject(c);
}
+#ifndef QT_NO_TRANSLATION
/*!
\qmlmethod string qsTranslate(string context, string sourceText, string disambiguation, int n)
return v8::Undefined();
return args[0];
}
-
+#endif // QT_NO_TRANSLATION
/*!
\qmlmethod Qt::locale(name)
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);
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);
QuickTestResult::parseArgs(argc, argv);
+#ifndef QT_NO_TRANSLATION
QTranslator translator;
if (!translationFile.isEmpty()) {
if (translator.load(translationFile)) {
qWarning("Could not load the translation file '%s'.", qPrintable(translationFile));
}
}
+#endif
// Determine where to look for the test data.
if (testPath.isEmpty() && sourceDir) {
#endif
}
+#ifndef QT_NO_TRANSLATION
static void loadTranslationFile(QTranslator &translator, const QString& directory)
{
translator.load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n"));
QCoreApplication::installTranslator(&translator);
}
+#endif
static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
{
app.setOrganizationName("Qt Project");
app.setOrganizationDomain("qt-project.org");
+#ifndef QT_NO_TRANSLATION
QTranslator translator;
QTranslator qtTranslator;
QString sysLocale = QLocale::system().name();
qWarning() << "Could not load the translation file" << options.translationFile;
}
}
+#endif
QUnifiedTimer::instance()->setSlowModeEnabled(options.slowAnimations);
if (!options.file.isEmpty()) {
if (!options.versionDetection || checkVersion(options.file)) {
+#ifndef QT_NO_TRANSLATION
QTranslator translator;
+#endif
// TODO: as soon as the engine construction completes, the debug service is
// listening for connections. But actually we aren't ready to debug anything.
engine.addNamedBundle(bundles.at(i).first, bundles.at(i).second);
if (options.file.isLocalFile()) {
QFileInfo fi(options.file.toLocalFile());
+#ifndef QT_NO_TRANSLATION
loadTranslationFile(translator, fi.path());
+#endif
loadDummyDataFiles(engine, fi.path());
}
QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));