peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt 5.6 incompatibilities fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2018-04-23 10:42:37 +02:00
parent 151a73cb0b
commit 4ce1780f90
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controls/QskTextInput.cpp
View File

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