diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-06-04 07:15:45 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-06-04 07:15:45 (GMT) |
| commit | 6078c083c0aca4d3b5b652fccce7b27de083c890 (patch) | |
| tree | 3244487f6f23041a3d722657ba83da04038d2638 | |
| parent | 3c5a4999703d36574e9d7017e633c29013e5e20d (diff) | |
| download | Qt-6078c083c0aca4d3b5b652fccce7b27de083c890.zip Qt-6078c083c0aca4d3b5b652fccce7b27de083c890.tar.gz Qt-6078c083c0aca4d3b5b652fccce7b27de083c890.tar.bz2 | |
Fix QT_NO_CLIPBOARD
Merge-request: 658
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 48826ff..94973f2 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -1056,6 +1056,7 @@ void QDeclarativeTextEdit::select(int start, int end) updateSelectionMarkers(); } +#ifndef QT_NO_CLIPBOARD /*! \qmlmethod TextEdit::cut() @@ -1088,7 +1089,7 @@ void QDeclarativeTextEdit::paste() Q_D(QDeclarativeTextEdit); d->control->paste(); } - +#endif // QT_NO_CLIPBOARD /*! \overload 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); |