aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-07-31 16:25:16 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-06 06:04:47 +0200
commit082dff2c8f5383e8372c1a4d7c61bc2eebe5c9df (patch)
treefc8074040d3d504173d21ce42a43a9d5c1d51f78 /src
parent49496cf8812c33f2796289a455da105710567e1c (diff)
Add tests for copy and paste using keyboard shortcuts.
Fixes TextInput.cut() removing text while read only. Change-Id: I03cd44d381be9d53f71ba168b8be7971ab0bbad7 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktextinput.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 5b7bbaf998..ced2e62a8c 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1899,8 +1899,10 @@ bool QQuickTextInput::isRightToLeft(int start, int end)
void QQuickTextInput::cut()
{
Q_D(QQuickTextInput);
- d->copy();
- d->del();
+ if (!d->m_readOnly) {
+ d->copy();
+ d->del();
+ }
}
/*!