diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-07 13:27:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-07 13:27:41 (GMT) |
| commit | 1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (patch) | |
| tree | 3842506134728d52e9b0340d2fdd50b2d7e0cace /src/declarative/graphicsitems/qdeclarativetextedit_p.h | |
| parent | 2b4d2fd1ada524f4780dd7633ca34bc72d823ff1 (diff) | |
| parent | eba8e2c10c5bc1b373fdf7640962029cb2e7908f (diff) | |
| download | Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.zip Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.gz Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.bz2 | |
Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into integration
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h index 3846d49..0ecb2f3 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h @@ -223,9 +223,11 @@ public Q_SLOTS: void selectAll(); void selectWord(); void select(int start, int end); +#ifndef QT_NO_CLIPBOARD void cut(); void copy(); void paste(); +#endif private Q_SLOTS: void updateImgCache(const QRectF &rect); |