diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-10-31 20:20:43 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-10-31 20:21:09 +0100 |
| commit | 473ef83dba6976250a1ff27175716aa1af970f2f (patch) | |
| tree | 922044c8be598f76945af1599196c7f379df280e /src/quick/items/qquicktextedit_p_p.h | |
| parent | beb6667d4e65dfe2ec9e7f554837524416c0f4dc (diff) | |
| parent | 0704d2be63b484cb579c1507223db3f914b1338a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I30f9c925631991ceb22339d1333936faecffbaf4
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 41a5107ccf..5233413cd7 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -122,7 +122,7 @@ public: Qt::LayoutDirection textDirection(const QString &text) const; bool isLinkHoveredConnected(); - void setNativeCursorEnabled(bool enabled) { control->setCursorWidth(enabled ? 1 : 0); } + void setNativeCursorEnabled(bool) {} void handleFocusEvent(QFocusEvent *event); void addCurrentTextNodeToRoot(QSGTransformNode *, QQuickTextNode*, TextNodeIterator&, int startPos); QQuickTextNode* createTextNode(); |