Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I470561a048e670ad91ce019d45a247ceb8a7b5ca

1 files changed, 8 insertions, 7 deletions

diff --git a/doc/src/snippets/code/doc_src_i18n.cpp b/doc/src/snippets/code/doc_src_i18n.cpp
index afde55d77..18a5def16 100644
--- a/doc/src/snippets/code/doc_src_i18n.cpp
+++ b/doc/src/snippets/code/doc_src_i18n.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -129,16 +129,10 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QTranslator qtTranslator;
-    qtTranslator.load("qt_" + QLocale::system().name(),
-            QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-    app.installTranslator(&qtTranslator);
-
     QTranslator myappTranslator;
     myappTranslator.load("myapp_" + QLocale::system().name());
     app.installTranslator(&myappTranslator);
 
-    ...
     return app.exec();
 }
 //! [8]
@@ -199,3 +193,10 @@ void same_global_function(LoginWidget *logwid)
             logwid);
 }
 //! [13]
+
+
+//! [14]
+    QTranslator qtTranslator;
+    qtTranslator.load(QLocale::system(), QStringLiteral("qtbase_"));
+    app.installTranslator(&qtTranslator);
+//! [14]