Merge remote-tracking branch 'origin/release' into stable

Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567

2 files changed, 14 insertions, 5 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 01bedb4a3a..0a504657a3 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -4063,18 +4063,21 @@ QDebug operator<<(QDebug dbg, const QObject *o) {
     \macro Q_CLASSINFO(Name, Value)
     \relates QObject
 
-    This macro associates extra information to the class, which is
-    available using QObject::metaObject(). Except for the ActiveQt
-    extension, Qt doesn't use this information.
+    This macro associates extra information to the class, which is available
+    using QObject::metaObject(). Qt makes only limited use of this feature, in
+    the \l{Active Qt}, \l{Qt D-Bus} and \l{Qt QML} modules.
 
-    The extra information takes the form of a \a Name string and a \a
-    Value literal string.
+    The extra information takes the form of a \a Name string and a \a Value
+    literal string.
 
     Example:
 
     \snippet code/src_corelib_kernel_qobject.cpp 35
 
     \sa QMetaObject::classInfo()
+    \sa QAxFactory
+    \sa {Using Qt D-Bus Adaptors}
+    \sa {Extending QML - Default Property Example}
 */
 
 /*!
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 843a6edce1..94c77302dd 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -465,6 +465,12 @@ QTranslator::~QTranslator()
     \li \c /opt/foolib/foo.qm
     \li \c /opt/foolib/foo
     \endlist
+
+    Usually, it is better to use the QTranslator::load(const QLocale &,
+    const QString &, const QString &, const QString &, const QString &)
+    function instead, because it uses \l{QLocale::uiLanguages()} and not simply
+    the locale name, which refers to the formatting of dates and numbers and not
+    necessarily the UI language.
 */
 
 bool QTranslator::load(const QString & filename, const QString & directory,