diff options
-rw-r--r-- | src/quick/items/qquicktext.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 895a616cb7..b89cfe8c04 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -72,7 +72,11 @@ QQuickTextPrivate::QQuickTextPrivate() , elideMode(QQuickText::ElideNone), hAlign(QQuickText::AlignLeft), vAlign(QQuickText::AlignTop) , format(QQuickText::AutoText), wrapMode(QQuickText::NoWrap) , style(QQuickText::Normal) +#if defined(QT_QUICK_DEFAULT_TEXT_RENDER_TYPE) + , renderType(QQuickText::QT_QUICK_DEFAULT_TEXT_RENDER_TYPE) +#else , renderType(QQuickText::QtRendering) +#endif , updateType(UpdatePaintNode) , maximumLineCountValid(false), updateOnComponentComplete(true), richText(false) , styledText(false), widthExceeded(false), heightExceeded(false), internalWidthUpdate(false) diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 90ed7f071e..e6f1c0ee21 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -106,7 +106,11 @@ public: , quickDocument(0), lastSelectionStart(0), lastSelectionEnd(0), lineCount(0) , hAlign(QQuickTextEdit::AlignLeft), vAlign(QQuickTextEdit::AlignTop) , format(QQuickTextEdit::PlainText), wrapMode(QQuickTextEdit::NoWrap) +#if defined(QT_QUICK_DEFAULT_TEXT_RENDER_TYPE) + , renderType(QQuickTextEdit::QT_QUICK_DEFAULT_TEXT_RENDER_TYPE) +#else , renderType(QQuickTextEdit::QtRendering) +#endif , contentDirection(Qt::LayoutDirectionAuto) , mouseSelectionMode(QQuickTextEdit::SelectCharacters) #ifndef QT_NO_IM diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 4946adc7e7..fa7462c0c5 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -115,7 +115,11 @@ public: , vAlign(QQuickTextInput::AlignTop) , wrapMode(QQuickTextInput::NoWrap) , m_echoMode(QQuickTextInput::Normal) +#if defined(QT_QUICK_DEFAULT_TEXT_RENDER_TYPE) + , renderType(QQuickTextInput::QT_QUICK_DEFAULT_TEXT_RENDER_TYPE) +#else , renderType(QQuickTextInput::QtRendering) +#endif , updateType(UpdatePaintNode) , mouseSelectionMode(QQuickTextInput::SelectCharacters) , m_layoutDirection(Qt::LayoutDirectionAuto) |