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

Conflicts:
	tools/qmlprofiler/qmlprofilerclient.cpp

Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4

1 files changed, 4 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 56252ec1ab..ae7c0cf8fb 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -2437,6 +2437,8 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */)
     Returns the QQmlEngine associated with \a object, if any.  This is equivalent to
     QQmlEngine::contextForObject(object)->engine(), but more efficient.
 
+    \note Add \c{#include <QtQml>} to use this function.
+
     \sa {QQmlEngine::contextForObject()}{contextForObject()}, qmlContext()
 */
 
@@ -2447,6 +2449,8 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */)
     Returns the QQmlContext associated with \a object, if any.  This is equivalent to
     QQmlEngine::contextForObject(object).
 
+    \note Add \c{#include <QtQml>} to use this function.
+
     \sa {QQmlEngine::contextForObject()}{contextForObject()}, qmlEngine()
 */