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

Conflicts:
	src/quick/util/qquickimageprovider.cpp

Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023

1 files changed, 7 insertions, 0 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);