From 4ce1780f90f6da8f05ee4f89fd1781a040c85ae7 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 23 Apr 2018 10:42:37 +0200
Subject: [PATCH] Qt 5.6 incompatibilities fixed

---
 src/controls/QskTextInput.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp
index eec07b84..53d530b7 100644
--- a/src/controls/QskTextInput.cpp
+++ b/src/controls/QskTextInput.cpp
@@ -153,7 +153,9 @@ namespace
             return;
 
         setCursorVisible( on );
+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
         d->setBlinkingCursorEnabled( on );
+#endif
 
         if ( !on )
         {
@@ -462,7 +464,7 @@ QskTextInput::ActivationModes QskTextInput::activationModes() const
 
 void QskTextInput::setActivationModes( ActivationModes modes )
 {
-    if ( m_data->activationModes != modes )
+    if ( static_cast< ActivationModes >( m_data->activationModes ) != modes )
     {
         m_data->activationModes = modes;
         Q_EMIT activationModesChanged();
@@ -658,8 +660,6 @@ QString QskTextInput::preeditText() const
 {
     auto d = QQuickTextInputPrivate::get( m_data->textInput );
     return d->m_textLayout.preeditAreaText();
-
-    return m_data->textInput->preeditText();
 }
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)