diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 15:19:16 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 15:26:14 (GMT) |
| commit | 4174dd5dca647bfbe5ff5db1d495b7f887833323 (patch) | |
| tree | 1fc2e851d38ac85824ddb691944972304c15c27f /src/declarative/graphicsitems/qdeclarativetextinput.cpp | |
| parent | dac9ed4cb0e11c71b70e84341fbd3c4db31e48aa (diff) | |
| parent | bd062a4532cb9ffc3539093da0adf3be6fdc8fc9 (diff) | |
| download | Qt-4174dd5dca647bfbe5ff5db1d495b7f887833323.zip Qt-4174dd5dca647bfbe5ff5db1d495b7f887833323.tar.gz Qt-4174dd5dca647bfbe5ff5db1d495b7f887833323.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index ff79256..e00d333 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -611,8 +611,8 @@ void QDeclarativeTextInput::setAutoScroll(bool b) This element provides a validator, which counts as valid any string which matches a specified regular expression. */ -/* - \qmlproperty string RegExpValidator::regExp +/*! + \qmlproperty regExp RegExpValidator::regExp This property holds the regular expression used for validation. |