diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-12-20 17:21:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-21 01:36:57 +0100 |
| commit | 3db5afa71443533eee6825a5fb0da29498f96b94 (patch) | |
| tree | 2836899440cbe1fc804cd93afe3db77895cf744c /src/quick/items/qquicktextcontrol.cpp | |
| parent | 83c5b4c199d66a4529b180abd2b5f67fbb221deb (diff) | |
Delay initializing the canPaste property until it's requested.
With xcb querying data from the clipboard can take as long as 50 ms.
Deferring the check until it is requested speeds up construction time
when it's not used and only checking the available formats when it is
requested should also help.
Change-Id: I796fc83d0457d9ac1490cfb9f510c6342eb8a872
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextcontrol.cpp')
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 90483e5831..13b33812a0 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -1743,12 +1743,12 @@ bool QQuickTextControl::canInsertFromMimeData(const QMimeData *source) const { Q_D(const QQuickTextControl); if (d->acceptRichText) - return (source->hasText() && !source->text().isEmpty()) + return source->hasText() || source->hasHtml() || source->hasFormat(QLatin1String("application/x-qrichtext")) || source->hasFormat(QLatin1String("application/x-qt-richtext")); else - return source->hasText() && !source->text().isEmpty(); + return source->hasText(); } void QQuickTextControl::insertFromMimeData(const QMimeData *source) |