From 6844d3f277e773441e78eb1d44c2b51b53507ece Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Fri, 29 Jan 2016 11:00:56 +0100
Subject: [PATCH] Find: Remove use of unsual QTextCursor constructors

Change-Id: If3b86d49c5b87974f7d40fcfa75e4a303ba55c1a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
(cherry picked from commit 1edd6193ba1bdf39c70e071bc267960b6387863e)
---
 src/plugins/coreplugin/find/basetextfind.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/plugins/coreplugin/find/basetextfind.cpp b/src/plugins/coreplugin/find/basetextfind.cpp
index f331d6206a4..2c08e6cfd03 100644
--- a/src/plugins/coreplugin/find/basetextfind.cpp
+++ b/src/plugins/coreplugin/find/basetextfind.cpp
@@ -39,10 +39,6 @@
 #include <QPlainTextEdit>
 #include <QTextCursor>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-#include <private/qtextcursor_p.h>
-#endif
-
 namespace Core {
 
 struct BaseTextFindPrivate
@@ -396,13 +392,10 @@ void BaseTextFind::defineFindScope()
 {
     QTextCursor cursor = textCursor();
     if (cursor.hasSelection() && cursor.block() != cursor.document()->findBlock(cursor.anchor())) {
-#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
-        d->m_findScopeStart = QTextCursorPrivate::fromPosition(document()->docHandle(), qMax(0, cursor.selectionStart()));
-        d->m_findScopeEnd = QTextCursorPrivate::fromPosition(document()->docHandle(), cursor.selectionEnd());
-#else
-        d->m_findScopeStart = QTextCursor(document()->docHandle(), qMax(0, cursor.selectionStart()));
-        d->m_findScopeEnd = QTextCursor(document()->docHandle(), cursor.selectionEnd());
-#endif
+        d->m_findScopeStart = cursor;
+        d->m_findScopeStart.setPosition(qMax(0, cursor.selectionStart()));
+        d->m_findScopeEnd = cursor;
+        d->m_findScopeEnd.setPosition(cursor.selectionEnd());
         d->m_findScopeVerticalBlockSelectionFirstColumn = -1;
         d->m_findScopeVerticalBlockSelectionLastColumn = -1;