diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-09 17:35:38 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-11-01 11:44:06 +0100 |
| commit | d1b39ca5c9444a8c54edd3aa4548e27458cee718 (patch) | |
| tree | 86cbd1b043d8762d6516df90e03a3b927e95e6d1 /src/quick/items/qquicktextedit.cpp | |
| parent | 492c611d2bd1344c325b447c1cba87cf7c97e988 (diff) | |
QQuickTextEdit: don't ifdef out properties
Take out the implementation body instead. These conditional properties
are causing trouble for controls (invalid alias location).
Change-Id: I509c6a156b8f6c6fa12488bfc5e301f60346f8a5
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index aca7150ca2..1ad37ed7dd 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1232,15 +1232,21 @@ void QQuickTextEdit::setTextMargin(qreal margin) \endlist */ -#ifndef QT_NO_IM Qt::InputMethodHints QQuickTextEdit::inputMethodHints() const { +#ifdef QT_NO_IM + return Qt::ImhNone; +#else Q_D(const QQuickTextEdit); return d->inputMethodHints; +#endif // QT_NO_IM } void QQuickTextEdit::setInputMethodHints(Qt::InputMethodHints hints) { +#ifdef QT_NO_IM + Q_UNUSED(hints); +#else Q_D(QQuickTextEdit); if (hints == d->inputMethodHints) @@ -1249,8 +1255,8 @@ void QQuickTextEdit::setInputMethodHints(Qt::InputMethodHints hints) d->inputMethodHints = hints; updateInputMethod(Qt::ImHints); emit inputMethodHintsChanged(); -} #endif // QT_NO_IM +} void QQuickTextEdit::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) @@ -1956,7 +1962,6 @@ bool QQuickTextEdit::canRedo() const return d->document->isRedoAvailable(); } -#ifndef QT_NO_IM /*! \qmlproperty bool QtQuick::TextEdit::inputMethodComposing @@ -1971,10 +1976,13 @@ bool QQuickTextEdit::canRedo() const */ bool QQuickTextEdit::isInputMethodComposing() const { +#ifdef QT_NO_IM + return false; +#else Q_D(const QQuickTextEdit); return d->control->hasImState(); -} #endif // QT_NO_IM +} void QQuickTextEditPrivate::init() { |