diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-03 10:37:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-04 01:19:14 +0100 |
| commit | bda2f4bdd855fddf6bd456efa0389e65eecb8c91 (patch) | |
| tree | feed56f3769c70812b3a7e16219e6971b0339d31 /src/quick/items | |
| parent | 03dbc6a857fcd4b57a8520dc0914ee907d1c1260 (diff) | |
Speed up TextInput and TextEdit creation.
Update the canPaste property directly when changing the read-only
property instead of connecting to the readOnlyChanged signal.
Change-Id: Ic6f6ba66f6b94448045703f7d2a66218548190dd
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index c25f305ec5..9977f60519 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1160,6 +1160,7 @@ void QQuickTextEdit::setReadOnly(bool r) if (!r) d->control->moveCursor(QTextCursor::End); + q_canPasteChanged(); emit readOnlyChanged(r); } @@ -1658,7 +1659,6 @@ void QQuickTextEditPrivate::init() QObject::connect(control, SIGNAL(cursorRectangleChanged()), q, SLOT(moveCursorDelegate())); QObject::connect(control, SIGNAL(linkActivated(QString)), q, SIGNAL(linkActivated(QString))); #ifndef QT_NO_CLIPBOARD - QObject::connect(q, SIGNAL(readOnlyChanged(bool)), q, SLOT(q_canPasteChanged())); QObject::connect(QGuiApplication::clipboard(), SIGNAL(dataChanged()), q, SLOT(q_canPasteChanged())); #endif diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index c271b777a2..2d5f5af49d 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -533,7 +533,7 @@ void QQuickTextInput::setReadOnly(bool ro) d->m_readOnly = ro; if (!ro) d->setCursorPosition(d->end()); - + q_canPasteChanged(); emit readOnlyChanged(ro); } @@ -2044,8 +2044,6 @@ void QQuickTextInputPrivate::init() q->setFlag(QQuickItem::ItemAcceptsInputMethod); q->setFlag(QQuickItem::ItemHasContents); #ifndef QT_NO_CLIPBOARD - q->connect(q, SIGNAL(readOnlyChanged(bool)), - q, SLOT(q_canPasteChanged())); q->connect(QGuiApplication::clipboard(), SIGNAL(dataChanged()), q, SLOT(q_canPasteChanged())); #endif // QT_NO_CLIPBOARD |