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

Conflicts:
	src/quick/util/qquickimageprovider.cpp

Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023

7 files changed, 53 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index adb0b81d45..93e66a1b12 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -2392,6 +2392,9 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */)
 #if defined(Q_OS_MAC) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT)
     const QString canonical = info.canonicalFilePath();
 #elif defined(Q_OS_WIN)
+    // No difference if the path is qrc based
+    if (absolute[0] == QLatin1Char(':'))
+        return true;
     const QString canonical = shellNormalizeFileName(absolute);
 #endif
 
diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp
index 1f1359a3c3..c8b29dc1ad 100644
--- a/src/quick/items/qquicktextdocument.cpp
+++ b/src/quick/items/qquicktextdocument.cpp
@@ -68,6 +68,10 @@ public:
     QPointer<QTextDocument> document;
 };
 
+/*!
+   Constructs a QQuickTextDocument object with
+   \a parent as the parent object.
+*/
 QQuickTextDocument::QQuickTextDocument(QQuickItem *parent)
     : QObject(*(new QQuickTextDocumentPrivate), parent)
 {
@@ -77,6 +81,9 @@ QQuickTextDocument::QQuickTextDocument(QQuickItem *parent)
     d->document = QPointer<QTextDocument>(qobject_cast<QQuickTextEdit*>(parent)->d_func()->document);
 }
 
+/*!
+   Returns a pointer to the QTextDocument object.
+*/
 QTextDocument* QQuickTextDocument::textDocument() const
 {
     Q_D(const QQuickTextDocument);
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index ab8e75bfef..087b8b8135 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1207,7 +1207,7 @@ void QQuickTextInput::setInputMethodHints(Qt::InputMethodHints hints)
     If you set a cursorDelegate for a TextInput, this delegate will be used for
     drawing the cursor instead of the standard cursor. An instance of the
     delegate will be created and managed by the TextInput when a cursor is
-    needed, and the x property of delegate instance will be set so as
+    needed, and the x property of the delegate instance will be set so as
     to be one pixel before the top left of the current character.
 
     Note that the root item of the delegate component must be a QQuickItem or
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 633cab8078..5fb0a9867e 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -188,6 +188,9 @@ QSGMaterialShader::QSGMaterialShader()
 {
 }
 
+/*!
+    \internal
+ */
 QSGMaterialShader::QSGMaterialShader(QSGMaterialShaderPrivate &dd)
     : d_ptr(&dd)
 {
@@ -463,7 +466,10 @@ QMatrix4x4 QSGMaterialShader::RenderState::combinedMatrix() const
     Q_ASSERT(m_data);
     return static_cast<const QSGRenderer *>(m_data)->currentCombinedMatrix();
 }
-
+/*!
+   Returns the ratio between physical pixels and device-independent pixels
+   to be used for rendering.
+*/
 float QSGMaterialShader::RenderState::devicePixelRatio() const
 {
     Q_ASSERT(m_data);
diff --git a/src/quick/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp
index b9f9bde476..2d05e736fe 100644
--- a/src/quick/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/quick/scenegraph/util/qsgtextureprovider.cpp
@@ -44,7 +44,15 @@ QT_BEGIN_NAMESPACE
 
     \sa {Scene Graph - Two Texture Providers}
  */
+/*!
+    \fn QSGTexture *QSGTextureProvider::texture();
 
+    Returns a pointer to the texture object.
+ */
+/*!
+    \fn void QSGTextureProvider::textureChanged();
 
+    This signal is emitted when the texture changes.
+ */
 
 QT_END_NAMESPACE
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index ff851dac30..d11229717a 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -494,5 +494,26 @@ QQuickAsyncImageProvider::~QQuickAsyncImageProvider()
     implementation of this method is reentrant.
 */
 
+/*!
+   \fn QImage QQuickImageProvider::requestImage(const QString &id, QSize *size, const QSize& requestedSize, bool requestedAutoTransform);
+
+   \internal
+   For future reference.
+*/
+
+/*!
+   \fn QPixmap QQuickImageProvider::requestPixmap(const QString &id, QSize *size, const QSize& requestedSize, bool requestedAutoTransform);
+
+   \internal
+   For future reference.
+*/
+
+/*!
+   \fn QQuickTextureFactory *QQuickImageProvider::requestTexture(const QString &id, QSize *size, const QSize &requestedSize, bool requestedAutoTransform);
+
+   \internal
+   For future reference.
+*/
+
 QT_END_NAMESPACE
 
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 7a4c18b579..cc7ece9c5b 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -1150,13 +1150,18 @@ void QQuickWidget::wheelEvent(QWheelEvent *e)
 }
 #endif
 
-
+/*!
+   \reimp
+*/
 void QQuickWidget::focusInEvent(QFocusEvent * event)
 {
     Q_D(QQuickWidget);
     d->offscreenWindow->focusInEvent(event);
 }
 
+/*!
+   \reimp
+*/
 void QQuickWidget::focusOutEvent(QFocusEvent * event)
 {
     Q_D(QQuickWidget);