diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:11 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:11 +0200 |
| commit | c2c012f79438d207cc95237c90b692121acc4876 (patch) | |
| tree | 39064e5a58161a7edb4e0c63f2d43e386d1f4059 /tools | |
| parent | 5208b2a671010b11b78312f9c4fe3c3098d253b4 (diff) | |
| parent | 5ed082ea4ce3580134a9a0c83e6fdb81a6231c8e (diff) | |
Merge 5.12 into 5.12.1
Change-Id: Ic746fbce93430867e2eda4bc7155d34e20a4aa2b
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlscene/main.cpp | 6 | ||||
| -rw-r--r-- | tools/tools.pro | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index c9e7dbadc9..c1399c38e5 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -546,15 +546,15 @@ int main(int argc, char ** argv) QLocale locale; QTranslator qtTranslator; if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) - app->installTranslator(&qtTranslator); + QCoreApplication::installTranslator(&qtTranslator); QTranslator translator; if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) - app->installTranslator(&translator); + QCoreApplication::installTranslator(&translator); QTranslator qmlTranslator; if (!options.translationFile.isEmpty()) { if (qmlTranslator.load(options.translationFile)) { - app->installTranslator(&qmlTranslator); + QCoreApplication::installTranslator(&qmlTranslator); } else { fprintf(stderr, "Could not load the translation file \"%s\"\n", qPrintable(options.translationFile)); diff --git a/tools/tools.pro b/tools/tools.pro index 3f5f23eb32..d3ec380717 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -3,6 +3,7 @@ QT_FOR_CONFIG += qml-private qtConfig(qml-devtools) { SUBDIRS += \ + qmllint \ qmlmin \ qmlimportscanner @@ -13,7 +14,6 @@ qtConfig(thread):!android|android_app { SUBDIRS += \ qml - qtConfig(qml-devtools): SUBDIRS += qmllint qtConfig(qml-profiler): SUBDIRS += qmlprofiler qtConfig(qml-preview): SUBDIRS += qmlpreview |