Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 39 insertions, 3 deletions

diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 4bd8874630..5767d52f6a 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -283,7 +283,7 @@ class QTranslatorPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QTranslator)
 public:
-    enum { Contexts = 0x2f, Hashes = 0x42, Messages = 0x69, NumerusRules = 0x88, Dependencies = 0x96 };
+    enum { Contexts = 0x2f, Hashes = 0x42, Messages = 0x69, NumerusRules = 0x88, Dependencies = 0x96, Language = 0xa7 };
 
     QTranslatorPrivate() :
 #if defined(QT_USE_MMAP)
@@ -316,6 +316,9 @@ public:
     uint contextLength;
     uint numerusRulesLength;
 
+    QString language;
+    QString filePath;
+
     bool do_load(const QString &filename, const QString &directory);
     bool do_load(const uchar *data, qsizetype len, const QString &directory);
     QString do_translate(const char *context, const char *sourceText, const char *comment,
@@ -597,8 +600,10 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo
         }
     }
 
-    if (ok && d->do_load(reinterpret_cast<const uchar *>(d->unmapPointer), d->unmapLength, directory))
+    if (ok && d->do_load(reinterpret_cast<const uchar *>(d->unmapPointer), d->unmapLength, directory)) {
+        d->filePath = realname;
         return true;
+    }
 
 #if defined(QT_USE_MMAP)
     if (used_mmap) {
@@ -829,7 +834,9 @@ bool QTranslatorPrivate::do_load(const uchar *data, qsizetype len, const QString
             break;
         }
 
-        if (tag == QTranslatorPrivate::Contexts) {
+        if (tag == QTranslatorPrivate::Language) {
+            language = QString::fromUtf8((const char*)data, blockLen);
+        } else if (tag == QTranslatorPrivate::Contexts) {
             contextArray = data;
             contextLength = blockLen;
         } else if (tag == QTranslatorPrivate::Hashes) {
@@ -1091,6 +1098,9 @@ void QTranslatorPrivate::clear()
     qDeleteAll(subTranslators);
     subTranslators.clear();
 
+    language.clear();
+    filePath.clear();
+
     if (QCoreApplicationPrivate::isTranslatorInstalled(q))
         QCoreApplication::postEvent(QCoreApplication::instance(),
                                     new QEvent(QEvent::LanguageChange));
@@ -1132,6 +1142,32 @@ bool QTranslator::isEmpty() const
             && d->subTranslators.isEmpty();
 }
 
+/*!
+    \since 5.15
+
+    Returns the target language as stored in the translation file.
+ */
+QString QTranslator::language() const
+{
+    Q_D(const QTranslator);
+    return d->language;
+}
+
+/*!
+    \since 5.15
+
+    Returns the path of the loaded translation file.
+
+    The file path is empty if no translation was loaded yet,
+    the loading failed, or if the translation was not loaded
+    from a file.
+ */
+QString QTranslator::filePath() const
+{
+    Q_D(const QTranslator);
+    return d->filePath;
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qtranslator.cpp"