diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 20:44:44 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 20:44:44 (GMT) |
| commit | ac67986f156861a7e64ed80a3a23db19fba8df6a (patch) | |
| tree | 26602e5314cbf73e91c78f885b1d5b583efad6ea /src/declarative/graphicsitems/qmlgraphicstextinput.cpp | |
| parent | 01116bb669f072af2227fff5f9da33bc77af7256 (diff) | |
| parent | 95e0e5b70b677a7468648a8ccc8d8ae553c3ca30 (diff) | |
| download | Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.zip Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.tar.gz Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.tar.bz2 | |
Merge remote branch 'staging/master' into bearermanagement/staging
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicstextinput.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextinput.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp index 6b4407f..d3c1f1f 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextInput QmlGraphicsTextInput + \since 4.7 The TextInput item allows you to add an editable line of text to a scene. TextInput can only display a single line of text, and can only display |