aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-02-14 12:55:38 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-14 07:48:38 +0100
commita4b0ac2af03f4a78469a3dc0e04f785cde4ab381 (patch)
treee67320e3e6f8bf215965c843c7c6838463b28b72 /src
parent452be83f43f190cce04b8dc6b4b5f2e797c5886b (diff)
Fix access to context properties within TextEdit.cursorDelegate
Don't create the cursorDelegate instance before componentComplete as the context may not be fully populated prior to that. Task-number: QTBUG-21780 Change-Id: I6ca8a24989bc28e5c5ca06d61a85e32ff630ce7c Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktextedit.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 5343715c3a..b9ff18e3d3 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -960,7 +960,7 @@ void QQuickTextEdit::setCursorDelegate(QDeclarativeComponent* c)
void QQuickTextEdit::loadCursorDelegate()
{
Q_D(QQuickTextEdit);
- if (d->cursorComponent->isLoading())
+ if (d->cursorComponent->isLoading() || !isComponentComplete())
return;
QDeclarativeContext *creationContext = d->cursorComponent->creationContext();
QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this));
@@ -1164,7 +1164,8 @@ void QQuickTextEdit::componentComplete()
updateSize();
d->dirty = false;
}
-
+ if (d->cursorComponent && d->cursorComponent->isReady())
+ loadCursorDelegate();
}
/*!
\qmlproperty bool QtQuick2::TextEdit::selectByMouse