Provide a context when constructing a TextInput cursor delegate.

Without a context the delegate won't be able to refer to any external
properties.

Task-number: QTBUG-21780
Change-Id: I7171787e677ce67466b311796693ed88bcacb718
Reviewed-on: http://codereview.qt-project.org/5837
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp
index 71c414fe02..3f1d95a4fc 100644
--- a/src/declarative/items/qsgtextinput.cpp
+++ b/src/declarative/items/qsgtextinput.cpp
@@ -971,8 +971,11 @@ void QSGTextInput::createCursor()
 
     if(d->cursorItem)
         delete d->cursorItem;
-    d->cursorItem = qobject_cast<QSGItem*>(d->cursorComponent->create());
+    QDeclarativeContext *creationContext = d->cursorComponent->creationContext();
+    QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this));
+    d->cursorItem = qobject_cast<QSGItem*>(object);
     if(!d->cursorItem){
+        delete object;
         qmlInfo(this, d->cursorComponent->errors()) << tr("Could not instantiate cursor delegate");
         return;
     }