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 /tools/qmlscene | |
| 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 'tools/qmlscene')
| -rw-r--r-- | tools/qmlscene/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index cee09e08a5..32bf32edd8 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -305,11 +305,13 @@ static void displayFileDialog(Options *options) #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) { @@ -412,6 +414,7 @@ int main(int argc, char ** argv) app.setOrganizationName("Qt Project"); app.setOrganizationDomain("qt-project.org"); +#ifndef QT_NO_TRANSLATION QTranslator translator; QTranslator qtTranslator; QString sysLocale = QLocale::system().name(); @@ -432,6 +435,7 @@ int main(int argc, char ** argv) qWarning() << "Could not load the translation file" << options.translationFile; } } +#endif QUnifiedTimer::instance()->setSlowModeEnabled(options.slowAnimations); @@ -446,7 +450,9 @@ int main(int argc, char ** argv) 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. @@ -458,7 +464,9 @@ int main(int argc, char ** argv) 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())); |