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_p.h | |
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_p.h')
-rw-r--r-- | src/quick/items/qquicktextedit_p.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 262dc04445..ea47c3b60e 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -81,18 +81,14 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem Q_PROPERTY(bool activeFocusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY activeFocusOnPressChanged) Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged) Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin NOTIFY textMarginChanged) -#ifndef QT_NO_IM Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged) -#endif Q_PROPERTY(bool selectByKeyboard READ selectByKeyboard WRITE setSelectByKeyboard NOTIFY selectByKeyboardChanged REVISION 1) Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged) Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged) Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged) Q_PROPERTY(bool canUndo READ canUndo NOTIFY canUndoChanged) Q_PROPERTY(bool canRedo READ canRedo NOTIFY canRedoChanged) -#ifndef QT_NO_IM Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged) -#endif Q_PROPERTY(QUrl baseUrl READ baseUrl WRITE setBaseUrl RESET resetBaseUrl NOTIFY baseUrlChanged) Q_PROPERTY(RenderType renderType READ renderType WRITE setRenderType NOTIFY renderTypeChanged) Q_PROPERTY(QQuickTextDocument *textDocument READ textDocument FINAL REVISION 1) @@ -192,10 +188,8 @@ public: qreal textMargin() const; void setTextMargin(qreal margin); -#ifndef QT_NO_IM Qt::InputMethodHints inputMethodHints() const; void setInputMethodHints(Qt::InputMethodHints hints); -#endif bool selectByKeyboard() const; void setSelectByKeyboard(bool); @@ -239,9 +233,7 @@ public: QRectF boundingRect() const Q_DECL_OVERRIDE; QRectF clipRect() const Q_DECL_OVERRIDE; -#ifndef QT_NO_IM bool isInputMethodComposing() const; -#endif RenderType renderType() const; void setRenderType(RenderType renderType); @@ -286,14 +278,10 @@ Q_SIGNALS: void canPasteChanged(); void canUndoChanged(); void canRedoChanged(); -#ifndef QT_NO_IM void inputMethodComposingChanged(); -#endif void effectiveHorizontalAlignmentChanged(); void baseUrlChanged(); -#ifndef QT_NO_IM void inputMethodHintsChanged(); -#endif void renderTypeChanged(); public Q_SLOTS: |