diff options
| author | Bernd Weimer <bweimer@blackberry.com> | 2014-04-14 09:50:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-24 10:15:51 +0200 |
| commit | c2d802049e48d1d6f0bce6eb0972fb26dc4d6ce3 (patch) | |
| tree | 332cf18bc9ce71596727d53f41e5ea54815807b9 /src/quick/items/qquicktextinput_p.h | |
| parent | 2e671bfedd5129d5043bf7da1d484aacc63bcc05 (diff) | |
Always implement text input "canPaste" property
This is needed for TextField control for instance.
If QT_NO_CLIPBOARD is defined, canPaste will always return false.
Fixes dialogs auto test when QT_NO_CLIPBOARD is defined.
[ChangeLog][QtQuick][Platform Specific Changes] Added canPaste
property to TextInput element also on platforms that don't support
a clipboard (QT_NO_CLIPBOARD is defined).
Change-Id: Ia85205672ba59c1fce70852458c514b03d332de6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 5f0250aaf1..042859df17 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -99,9 +99,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged) Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged) Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged) -#ifndef QT_NO_CLIPBOARD Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged) -#endif Q_PROPERTY(bool canUndo READ canUndo NOTIFY canUndoChanged) Q_PROPERTY(bool canRedo READ canRedo NOTIFY canRedoChanged) #ifndef QT_NO_IM @@ -256,9 +254,7 @@ public: QRectF boundingRect() const; QRectF clipRect() const; -#ifndef QT_NO_CLIPBOARD bool canPaste() const; -#endif bool canUndo() const; bool canRedo() const; |