summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-02-01 13:33:20 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-02-01 14:25:00 +0000
commite432c715dd6b17787eb8c1a24078c3ed751441a1 (patch)
tree85926c1a62c8db4a87bef6070eb48e4c8f2611b1
parentf38d29133956c4196fbfd66895f3a31fad5f9948 (diff)
downloadqt-creator-e432c715dd6b17787eb8c1a24078c3ed751441a1.tar.gz
TextEditor: Revert adaptation to reverted QTextCursor API change.
Change-Id: I1f778f6389adc6937330b727006ad89880328cb5 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
-rw-r--r--src/plugins/texteditor/texteditoroverlay.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp
index 7837fd52b5..025b320638 100644
--- a/src/plugins/texteditor/texteditoroverlay.cpp
+++ b/src/plugins/texteditor/texteditoroverlay.cpp
@@ -37,10 +37,6 @@
#include <QPainter>
#include <QTextBlock>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-#include <private/qtextcursor_p.h>
-#endif
-
using namespace TextEditor;
using namespace TextEditor::Internal;
@@ -96,13 +92,8 @@ void TextEditorOverlay::addOverlaySelection(int begin, int end,
selection.m_fg = fg;
selection.m_bg = bg;
-#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
- selection.m_cursor_begin = QTextCursorPrivate::fromPosition(document->docHandle(), begin);
- selection.m_cursor_end = QTextCursorPrivate::fromPosition(document->docHandle(), end);
-#else
selection.m_cursor_begin = QTextCursor(document->docHandle(), begin);
selection.m_cursor_end = QTextCursor(document->docHandle(), end);
-#endif
if (overlaySelectionFlags & ExpandBegin)
selection.m_cursor_begin.setKeepPositionOnInsert(true);