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

Conflicts:
	src/quick/util/qquickimageprovider.cpp

Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023

2 files changed, 8 insertions, 1 deletions

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