diff options
| author | Damian Jansen <damian.jansen@nokia.com> | 2011-10-19 15:04:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 09:01:28 +0200 |
| commit | 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb (patch) | |
| tree | f264def252b28943e7dda1538ecd73e72746538a /src/declarative/items/qquicktextedit.cpp | |
| parent | 27933ae4ee5741d09b607635213232d94c444633 (diff) | |
Remove Q_WS_*, symbian and maemo code in QtDeclarative
Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/items/qquicktextedit.cpp')
| -rw-r--r-- | src/declarative/items/qquicktextedit.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/declarative/items/qquicktextedit.cpp b/src/declarative/items/qquicktextedit.cpp index 75f60bc08c..f132c70400 100644 --- a/src/declarative/items/qquicktextedit.cpp +++ b/src/declarative/items/qquicktextedit.cpp @@ -1490,7 +1490,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * } else if (oldNode == 0 || d->documentDirty) { d->documentDirty = false; -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) // Make sure document is relayouted in the paint node on Mac // to avoid crashes due to the font engines created in the // shaping process @@ -1519,7 +1519,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * selectionEnd() - 1); // selectionEnd() returns first char after // selection -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) // We also need to make sure the document layout is redone when // control is returned to the main thread, as all the font engines // are now owned by the rendering thread @@ -1873,9 +1873,7 @@ void QQuickTextEditPrivate::updateDefaultTextOption() customizing when you want the input keyboard to be shown and hidden in your application. - By default the opening of input panels follows the platform style. On Symbian^1 and - Symbian^3 -based devices the panels are opened by clicking TextEdit. On other platforms - the panels are automatically opened when TextEdit element gains active focus. Input panels are + By default the opening of input panels follows the platform style. Input panels are always closed if no editor has active focus. You can disable the automatic behavior by setting the property \c activeFocusOnPress to false @@ -1918,9 +1916,7 @@ void QQuickTextEdit::openSoftwareInputPanel() for customizing when you want the input keyboard to be shown and hidden in your application. - By default the opening of input panels follows the platform style. On Symbian^1 and - Symbian^3 -based devices the panels are opened by clicking TextEdit. On other platforms - the panels are automatically opened when TextEdit element gains active focus. Input panels are + By default the opening of input panels follows the platform style. Input panels are always closed if no editor has active focus. You can disable the automatic behavior by setting the property \c activeFocusOnPress to false |