diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 01:00:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 01:00:07 +0100 |
commit | df8784fa1fc4792007393ea995756c2d490691d7 (patch) | |
tree | d4b8d6bdc855e4045c39f7710f206b7cfcf3d493 /tools/qmlscene | |
parent | b799e061a3cbf995ac7c88b315f5916e3a687162 (diff) | |
parent | 5246b910771e0dd824b4eea7c5245e5f9f3a63f0 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I57e4b762dcccf2f7f6e4b659f6fc8c40465d3322
Diffstat (limited to 'tools/qmlscene')
-rw-r--r-- | tools/qmlscene/main.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 1372bd3751..5190368e20 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -310,14 +310,6 @@ static void displayFileDialog(Options *options) puts("No filename specified..."); } -#if QT_CONFIG(translation) -static void loadTranslationFile(QTranslator &translator, const QString& directory) -{ - translator.load(QLocale(), QLatin1String("qml"), QLatin1String("_"), directory + QLatin1String("/i18n")); - QCoreApplication::installTranslator(&translator); -} -#endif - static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory) { QDir dir(directory+"/dummydata", "*.qml"); @@ -588,10 +580,6 @@ int main(int argc, char ** argv) if (!options.url.isEmpty()) { if (!options.versionDetection || checkVersion(options.url)) { -#if QT_CONFIG(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. QQmlEngine engine; @@ -603,7 +591,9 @@ int main(int argc, char ** argv) if (options.url.isLocalFile()) { QFileInfo fi(options.url.toLocalFile()); #if QT_CONFIG(translation) - loadTranslationFile(translator, fi.path()); + QTranslator *translator = new QTranslator(app.get()); + if (translator->load(QLocale(), QLatin1String("qml"), QLatin1String("_"), fi.path() + QLatin1String("/i18n"))) + QCoreApplication::installTranslator(translator); #endif loadDummyDataFiles(engine, fi.path()); } |