Use enum class in the public API

This change was suggested in the API review.

All the "old" enums are backwards compatible in QML, since unscoped
values are enabled by default.

Added the following new enum values maintaining compatibility (in QML):
- QVirtualKeyboardInputEngine::PatternRecognitionMode::None (same as PatternRecognitionDisabled)
- QVirtualKeyboardInputEngine::PatternRecognitionMode::Handwriting (same as HandwritingRecoginition)
- QVirtualKeyboardSelectionListModel::Role::Display (same as DisplayRole)
- QVirtualKeyboardSelectionListModel::Role::WordCompletionLength (same as WordCompletionLengthRole)

Renamed the following enum values (new in 5.12):
- QVirtualKeyboardSelectionListModel::Role::Dictionary (was DictionaryTypeRole)
- QVirtualKeyboardSelectionListModel::Role::CanRemoveSuggestion (was CanRemoveSuggestionRole)
- QVirtualKeyboardSelectionListModel::DictionaryType::Default (was DefaultDictionary)
- QVirtualKeyboardSelectionListModel::DictionaryType::User (was UserDictionary)

Added missing Q_DECLARE_METATYPE for:
- QVirtualKeyboardInputEngine::PatternRecognitionMode
- QVirtualKeyboardInputEngine::ReselectFlag
- QVirtualKeyboardSelectionListModel::DictionaryType

The enums can be found in:
- src/virtualkeyboard/qvirtualkeyboardinputengine.h
- src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h

Added a test case for verifying QML enum values.

Change-Id: I16749af71aadd762e9c303b5c682b2888afaa672
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

105 files changed, 667 insertions, 564 deletions

diff --git a/src/plugins/hangul/hangulinputmethod.cpp b/src/plugins/hangul/hangulinputmethod.cpp
index 23caf8ca..1bef78cb 100644
--- a/src/plugins/hangul/hangulinputmethod.cpp
+++ b/src/plugins/hangul/hangulinputmethod.cpp
@@ -51,7 +51,7 @@ HangulInputMethod::~HangulInputMethod()
 QList<QVirtualKeyboardInputEngine::InputMode> HangulInputMethod::inputModes(const QString &locale)
 {
     Q_UNUSED(locale)
-    return QList<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Hangul;
+    return QList<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::Hangul;
 }
 
 bool HangulInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode)
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
index ac2763fb..884ec9df 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp
@@ -62,22 +62,22 @@ QList<QVirtualKeyboardInputEngine::InputMode> HunspellInputMethod::inputModes(co
     QList<QVirtualKeyboardInputEngine::InputMode> result;
     switch (QLocale(locale).script()) {
     case QLocale::GreekScript:
-        result.append(QVirtualKeyboardInputEngine::Greek);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Greek);
         break;
     case QLocale::CyrillicScript:
-        result.append(QVirtualKeyboardInputEngine::Cyrillic);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Cyrillic);
         break;
     case QLocale::ArabicScript:
-        result.append(QVirtualKeyboardInputEngine::Arabic);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Arabic);
         break;
     case QLocale::HebrewScript:
-        result.append(QVirtualKeyboardInputEngine::Hebrew);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Hebrew);
         break;
     default:
         break;
     }
-    result.append(QVirtualKeyboardInputEngine::Latin);
-    result.append(QVirtualKeyboardInputEngine::Numeric);
+    result.append(QVirtualKeyboardInputEngine::InputMode::Latin);
+    result.append(QVirtualKeyboardInputEngine::InputMode::Numeric);
     return result;
 }
 
@@ -116,8 +116,8 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar
             if (!word.isEmpty()) {
                 d->wordCandidates.updateWord(0, word);
                 if (d->updateSuggestions()) {
-                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index());
+                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->wordCandidates.index());
                 }
             } else {
                 d->reset();
@@ -167,8 +167,8 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar
                 ic->setPreeditText(word);
                 d->ignoreUpdate = false;
                 if (d->updateSuggestions()) {
-                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index());
+                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->wordCandidates.index());
                 }
                 accept = true;
             } else if (text.length() > 1) {
@@ -201,7 +201,7 @@ QList<QVirtualKeyboardSelectionListModel::Type> HunspellInputMethod::selectionLi
     Qt::InputMethodHints inputMethodHints = ic->inputMethodHints();
     if (d->dictionaryState == HunspellInputMethodPrivate::DictionaryNotLoaded || inputMethodHints.testFlag(Qt::ImhNoPredictiveText) || inputMethodHints.testFlag(Qt::ImhHiddenText))
         return QList<QVirtualKeyboardSelectionListModel::Type>();
-    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList;
+    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::Type::WordCandidateList;
 }
 
 int HunspellInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type)
@@ -211,15 +211,15 @@ int HunspellInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListMod
     return d->wordCandidates.size();
 }
 
-QVariant HunspellInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant HunspellInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     QVariant result;
     Q_D(HunspellInputMethod);
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         result = QVariant(d->wordCandidates.wordAt(index));
         break;
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
     {
         const QString wordCandidate(d->wordCandidates.wordAt(index));
         const QString word(d->wordCandidates.wordAt(0));
@@ -227,16 +227,16 @@ QVariant HunspellInputMethod::selectionListData(QVirtualKeyboardSelectionListMod
         result.setValue((wordCompletionLength > 0 && wordCandidate.startsWith(word)) ? wordCompletionLength : 0);
         break;
     }
-    case QVirtualKeyboardSelectionListModel::DictionaryTypeRole:
+    case QVirtualKeyboardSelectionListModel::Role::Dictionary:
     {
         const QString wordCandidate(d->wordCandidates.wordAt(index));
         QVirtualKeyboardSelectionListModel::DictionaryType dictionaryType =
                 d->userDictionaryWords && d->userDictionaryWords->contains(wordCandidate) ?
-                    QVirtualKeyboardSelectionListModel::UserDictionary : QVirtualKeyboardSelectionListModel::DefaultDictionary;
+                    QVirtualKeyboardSelectionListModel::DictionaryType::User : QVirtualKeyboardSelectionListModel::DictionaryType::Default;
         result = QVariant(static_cast<int>(dictionaryType));
         break;
     }
-    case QVirtualKeyboardSelectionListModel::CanRemoveSuggestionRole:
+    case QVirtualKeyboardSelectionListModel::Role::CanRemoveSuggestion:
         result.setValue(index > 0 && d->wordCandidates.wordFlagsAt(index).testFlag(HunspellWordList::SpellCheckOk));
         break;
     default:
@@ -288,7 +288,7 @@ bool HunspellInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInp
     const QString surroundingText = ic->surroundingText();
     int replaceFrom = 0;
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordBeforeCursor)) {
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordBeforeCursor)) {
         for (int i = cursorPosition - 1; i >= 0; --i) {
             QChar c = surroundingText.at(i);
             if (!d->isValidInputChar(c))
@@ -303,10 +303,10 @@ bool HunspellInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInp
         }
     }
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == 0)
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordAtCursor) && replaceFrom == 0)
         return false;
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAfterCursor)) {
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordAfterCursor)) {
         for (int i = cursorPosition; i < surroundingText.length(); ++i) {
             QChar c = surroundingText.at(i);
             if (!d->isValidInputChar(c))
@@ -325,7 +325,7 @@ bool HunspellInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInp
     if (word.isEmpty())
         return false;
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == -word.length())
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordAtCursor) && replaceFrom == -word.length())
         return false;
 
     if (d->isJoiner(word.at(0)))
@@ -339,8 +339,8 @@ bool HunspellInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInp
 
     d->autoSpaceAllowed = false;
     if (d->updateSuggestions()) {
-        emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-        emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index());
+        emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+        emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->wordCandidates.index());
     }
 
     return true;
@@ -384,8 +384,8 @@ void HunspellInputMethod::updateSuggestions(const QSharedPointer<HunspellWordLis
     d->wordCandidates = *wordList;
     if (d->wordCandidates.wordAt(0).compare(word) != 0)
         d->wordCandidates.updateWord(0, word);
-    emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index());
+    emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->wordCandidates.index());
 }
 
 void HunspellInputMethod::dictionaryLoadCompleted(bool success)
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
index 9109ac09..4651ac1f 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp
@@ -113,8 +113,8 @@ void HunspellInputMethodPrivate::reset()
 {
     if (clearSuggestions(true)) {
         Q_Q(HunspellInputMethod);
-        emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, wordCandidates.index());
+        emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, wordCandidates.index());
     }
     autoSpaceAllowed = false;
 }
@@ -187,7 +187,7 @@ bool HunspellInputMethodPrivate::isAutoSpaceAllowed() const
     Q_Q(const HunspellInputMethod);
     if (!autoSpaceAllowed)
         return false;
-    if (q->inputEngine()->inputMode() == QVirtualKeyboardInputEngine::Numeric)
+    if (q->inputEngine()->inputMode() == QVirtualKeyboardInputEngine::InputMode::Numeric)
         return false;
     QVirtualKeyboardInputContext *ic = q->inputContext();
     if (!ic)
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
index c4682d0f..921b1b05 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
@@ -67,7 +67,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
     bool selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index);
 
diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
index 98edb403..21ade9ac 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
+++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp
@@ -80,7 +80,7 @@ public:
 #endif
         q_ptr(q_ptr),
         recognizeTimer(0),
-        textCase(QVirtualKeyboardInputEngine::Lower)
+        textCase(QVirtualKeyboardInputEngine::TextCase::Lower)
 #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT
         , unipenTrace(0)
 #endif
@@ -278,7 +278,7 @@ public:
 #ifdef HAVE_HUNSPELL
                         int activeWordIndex = wordCandidates.index();
                         if (activeWordIndex != -1) {
-                            q->selectionListItemSelected(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+                            q->selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
                             return;
                         }
 #endif
@@ -298,8 +298,8 @@ public:
                         cancelRecognition();
                         if (!(ic->inputMethodHints() & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly))) {
                             QVirtualKeyboardInputEngine::InputMode inputMode = ic->inputEngine()->inputMode();
-                            inputMode = inputMode == QVirtualKeyboardInputEngine::Latin ?
-                                        QVirtualKeyboardInputEngine::Numeric : QVirtualKeyboardInputEngine::Latin;
+                            inputMode = inputMode == QVirtualKeyboardInputEngine::InputMode::Latin ?
+                                        QVirtualKeyboardInputEngine::InputMode::Numeric : QVirtualKeyboardInputEngine::InputMode::Latin;
                             ic->inputEngine()->setInputMode(inputMode);
                         }
                     } else if (swipeTouchCount == 2) {
@@ -422,7 +422,7 @@ public:
 #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT
         // In recording mode, the text case must match with the current text case
         if (unipenTrace) {
-            if (!ch.isLetter() || (ch.isUpper() == (textCase == QVirtualKeyboardInputEngine::Upper)))
+            if (!ch.isLetter() || (ch.isUpper() == (textCase == QVirtualKeyboardInputEngine::TextCase::Upper)))
                 saveTraces(ch.unicode(), qRound(result["confidence"].toDouble() * 100));
             delete unipenTrace;
             unipenTrace = 0;
@@ -430,7 +430,7 @@ public:
 #endif
         Q_Q(LipiInputMethod);
         q->inputContext()->inputEngine()->virtualKeyClick((Qt::Key)chUpper.unicode(),
-                    textCase == QVirtualKeyboardInputEngine::Lower ? QString(ch.toLower()) : QString(chUpper),
+                    textCase == QVirtualKeyboardInputEngine::TextCase::Lower ? QString(ch.toLower()) : QString(chUpper),
                     Qt::NoModifier);
     }
 
@@ -499,12 +499,12 @@ QList<QVirtualKeyboardInputEngine::InputMode> LipiInputMethod::inputModes(const
     const Qt::InputMethodHints inputMethodHints(inputContext()->inputMethodHints());
 
     if (inputMethodHints.testFlag(Qt::ImhDialableCharactersOnly) || inputMethodHints.testFlag(Qt::ImhDigitsOnly)) {
-        availableInputModes.append(QVirtualKeyboardInputEngine::Dialable);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Dialable);
     } else if (inputMethodHints.testFlag(Qt::ImhFormattedNumbersOnly)) {
-        availableInputModes.append(QVirtualKeyboardInputEngine::Numeric);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Numeric);
     } else {
-        availableInputModes.append(QVirtualKeyboardInputEngine::Latin);
-        availableInputModes.append(QVirtualKeyboardInputEngine::Numeric);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Latin);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Numeric);
     }
 
     return availableInputModes;
@@ -523,11 +523,11 @@ bool LipiInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputE
         return false;
     d->subsetOfClasses.clear();
     switch (inputMode) {
-    case QVirtualKeyboardInputEngine::Latin:
+    case QVirtualKeyboardInputEngine::InputMode::Latin:
         d->recognizer.subsetOfClasses(QStringLiteral("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz?,.@"), d->subsetOfClasses);
         break;
-    case QVirtualKeyboardInputEngine::Numeric:
-    case QVirtualKeyboardInputEngine::Dialable:
+    case QVirtualKeyboardInputEngine::InputMode::Numeric:
+    case QVirtualKeyboardInputEngine::InputMode::Dialable:
         d->recognizer.subsetOfClasses(QStringLiteral("1234567890,.+"), d->subsetOfClasses);
         break;
     default:
@@ -593,7 +593,7 @@ void LipiInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListMod
 QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> LipiInputMethod::patternRecognitionModes() const
 {
     return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>()
-            << QVirtualKeyboardInputEngine::HandwritingRecoginition;
+            << QVirtualKeyboardInputEngine::PatternRecognitionMode::Handwriting;
 }
 
 QVirtualKeyboardTrace *LipiInputMethod::traceBegin(
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod.cpp b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
index c5dd764e..aaa4d62e 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod.cpp
+++ b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
@@ -134,7 +134,7 @@ public:
         m_onManagingResult(false),
         m_isProcessing(false),
         m_commitTimer(0),
-        textCase(QVirtualKeyboardInputEngine::Lower),
+        textCase(QVirtualKeyboardInputEngine::TextCase::Lower),
         wordIndex(-1),
         m_itemIndex(-1),
         m_preeditCursorPosition(0)
@@ -877,8 +877,8 @@ public:
     {
         Q_Q(MyScriptInputMethod);
 
-        emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, wordIndex);
+        emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, wordIndex);
     }
 
     void updatePreeditTextCursor(int cursorPosition)
@@ -976,7 +976,7 @@ QList<QVirtualKeyboardInputEngine::InputMode> MyScriptInputMethod::inputModes(co
 {
     Q_UNUSED(locale);
     return QList<QVirtualKeyboardInputEngine::InputMode>()
-            << QVirtualKeyboardInputEngine::Latin;
+            << QVirtualKeyboardInputEngine::InputMode::Latin;
 }
 
 bool MyScriptInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode)
@@ -1038,30 +1038,30 @@ void MyScriptInputMethod::update()
 
 QList<QVirtualKeyboardSelectionListModel::Type> MyScriptInputMethod::selectionLists()
 {
-    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList;
+    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::Type::WordCandidateList;
 }
 
 int MyScriptInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type)
 {
     Q_D(MyScriptInputMethod);
 
-    if (type != QVirtualKeyboardSelectionListModel::WordCandidateList)
+    if (type != QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
         return 0;
 
     return d->wordCandidates.count();
 }
 
-QVariant MyScriptInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant MyScriptInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     Q_D(MyScriptInputMethod);
 
-    if (type != QVirtualKeyboardSelectionListModel::WordCandidateList)
+    if (type != QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
         return QVariant();
 
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         return QVariant(d->wordCandidates.at(index));
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
     {
         const QString wordCandidate(d->wordCandidates.at(index));
         int wordCompletionLength = wordCandidate.length() - d->word.length();
@@ -1103,7 +1103,7 @@ void MyScriptInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionLis
 QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> MyScriptInputMethod::patternRecognitionModes() const
 {
     return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>()
-            << QVirtualKeyboardInputEngine::HandwritingRecoginition;
+            << QVirtualKeyboardInputEngine::PatternRecognitionMode::Handwriting;
 }
 
 QVirtualKeyboardTrace *MyScriptInputMethod::traceBegin(
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod_p.h b/src/plugins/myscript/plugin/myscriptinputmethod_p.h
index 91e27f8c..2f022fd2 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod_p.h
+++ b/src/plugins/myscript/plugin/myscriptinputmethod_p.h
@@ -70,7 +70,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists() override;
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) override;
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) override;
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role) override;
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) override;
 
     QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const override;
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod.cpp b/src/plugins/openwnn/plugin/openwnninputmethod.cpp
index 9d5d521d..4d47a0a5 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod.cpp
+++ b/src/plugins/openwnn/plugin/openwnninputmethod.cpp
@@ -65,7 +65,7 @@ public:
 
     OpenWnnInputMethodPrivate(OpenWnnInputMethod *q_ptr) :
         q_ptr(q_ptr),
-        inputMode(QVirtualKeyboardInputEngine::Latin),
+        inputMode(QVirtualKeyboardInputEngine::InputMode::Latin),
         exactMatchMode(false),
         converter(nullptr),
         converterJAJP(),
@@ -318,9 +318,9 @@ public:
 
         Q_Q(OpenWnnInputMethod);
         if (!candidateList.isEmpty() || !wasEmpty)
-            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
+            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
         if (previousActiveWordIndex != activeWordIndex)
-            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
     }
 
     void clearCandidates(bool deferUpdate = false)
@@ -329,7 +329,7 @@ public:
             candidateList.clear();
             if (!deferUpdate) {
                 Q_Q(OpenWnnInputMethod);
-                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
+                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
             }
             clearFocusCandidate(deferUpdate);
         }
@@ -343,7 +343,7 @@ public:
         activeWordIndex++;
         if (activeWordIndex >= candidateList.size())
             activeWordIndex = 0;
-        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
         return candidateList.at(activeWordIndex);
     }
 
@@ -353,7 +353,7 @@ public:
         if (activeWordIndex != -1) {
             activeWordIndex = -1;
             if (!deferUpdate)
-                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
         }
     }
 
@@ -373,7 +373,7 @@ public:
             enableConverter = false;
         }
 
-        if (inputMode != QVirtualKeyboardInputEngine::Hiragana ||
+        if (inputMode != QVirtualKeyboardInputEngine::InputMode::Hiragana ||
             inputMethodHints.testFlag(Qt::ImhHiddenText) ||
             inputMethodHints.testFlag(Qt::ImhSensitiveData) ||
             inputMethodHints.testFlag(Qt::ImhNoPredictiveText)) {
@@ -381,7 +381,7 @@ public:
                 enablePrediction = false;
                 emit q->selectionListsChanged();
             }
-        } else if (inputMode == QVirtualKeyboardInputEngine::Hiragana && !enablePrediction) {
+        } else if (inputMode == QVirtualKeyboardInputEngine::InputMode::Hiragana && !enablePrediction) {
             enablePrediction = true;
             emit q->selectionListsChanged();
         }
@@ -621,10 +621,10 @@ QList<QVirtualKeyboardInputEngine::InputMode> OpenWnnInputMethod::inputModes(con
 {
     Q_UNUSED(locale)
     return QList<QVirtualKeyboardInputEngine::InputMode>()
-            << QVirtualKeyboardInputEngine::Hiragana
-            << QVirtualKeyboardInputEngine::Katakana
-            << QVirtualKeyboardInputEngine::FullwidthLatin
-            << QVirtualKeyboardInputEngine::Latin;
+            << QVirtualKeyboardInputEngine::InputMode::Hiragana
+            << QVirtualKeyboardInputEngine::InputMode::Katakana
+            << QVirtualKeyboardInputEngine::InputMode::FullwidthLatin
+            << QVirtualKeyboardInputEngine::InputMode::Latin;
 }
 
 bool OpenWnnInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode)
@@ -635,11 +635,11 @@ bool OpenWnnInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInp
         return true;
     update();
     switch (inputMode) {
-    case QVirtualKeyboardInputEngine::Hiragana:
+    case QVirtualKeyboardInputEngine::InputMode::Hiragana:
         d->changeEngineMode(OpenWnnInputMethodPrivate::ENGINE_MODE_DEFAULT);
         break;
 
-    case QVirtualKeyboardInputEngine::Katakana:
+    case QVirtualKeyboardInputEngine::InputMode::Katakana:
         d->changeEngineMode(OpenWnnInputMethodPrivate::ENGINE_MODE_FULL_KATAKANA);
         break;
 
@@ -773,7 +773,7 @@ QList<QVirtualKeyboardSelectionListModel::Type> OpenWnnInputMethod::selectionLis
     Q_D(OpenWnnInputMethod);
     if (!d->enablePrediction)
         return QList<QVirtualKeyboardSelectionListModel::Type>();
-    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList;
+    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::Type::WordCandidateList;
 }
 
 int OpenWnnInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type)
@@ -783,15 +783,15 @@ int OpenWnnInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListMode
     return d->candidateList.size();
 }
 
-QVariant OpenWnnInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant OpenWnnInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     QVariant result;
     Q_D(OpenWnnInputMethod);
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         result = QVariant(d->candidateList.at(index)->candidate);
         break;
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
         result.setValue(0);
         break;
     default:
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod_p.h b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
index a80b38be..dbb2c8ed 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod_p.h
+++ b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
@@ -65,7 +65,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
 
     void reset();
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod.cpp b/src/plugins/pinyin/plugin/pinyininputmethod.cpp
index eb45da7a..8cc13c79 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod.cpp
+++ b/src/plugins/pinyin/plugin/pinyininputmethod.cpp
@@ -51,7 +51,7 @@ public:
 
     PinyinInputMethodPrivate(PinyinInputMethod *q_ptr) :
         q_ptr(q_ptr),
-        inputMode(QVirtualKeyboardInputEngine::Pinyin),
+        inputMode(QVirtualKeyboardInputEngine::InputMode::Pinyin),
         pinyinDecoderService(PinyinDecoderService::getInstance()),
         state(Idle),
         surface(),
@@ -281,8 +281,8 @@ public:
     void updateCandidateList()
     {
         Q_Q(PinyinInputMethod);
-        emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList,
+        emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+        emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList,
                                                totalChoicesNum > 0 && state == PinyinInputMethodPrivate::Input ? 0 : -1);
     }
 
@@ -290,7 +290,7 @@ public:
     {
         Q_Q(PinyinInputMethod);
         QVirtualKeyboardInputContext *inputContext = q->inputContext();
-        return inputMode == QVirtualKeyboardInputEngine::Pinyin &&
+        return inputMode == QVirtualKeyboardInputEngine::InputMode::Pinyin &&
                 composingStr.length() == fixedLen &&
                 inputContext &&
                 !inputContext->inputMethodHints().testFlag(Qt::ImhNoPredictiveText);
@@ -380,8 +380,8 @@ QList<QVirtualKeyboardInputEngine::InputMode> PinyinInputMethod::inputModes(cons
     Q_D(PinyinInputMethod);
     QList<QVirtualKeyboardInputEngine::InputMode> result;
     if (d->pinyinDecoderService)
-        result << QVirtualKeyboardInputEngine::Pinyin;
-    result << QVirtualKeyboardInputEngine::Latin;
+        result << QVirtualKeyboardInputEngine::InputMode::Pinyin;
+    result << QVirtualKeyboardInputEngine::InputMode::Latin;
     return result;
 }
 
@@ -390,7 +390,7 @@ bool PinyinInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInpu
     Q_UNUSED(locale)
     Q_D(PinyinInputMethod);
     reset();
-    if (inputMode == QVirtualKeyboardInputEngine::Pinyin && !d->pinyinDecoderService)
+    if (inputMode == QVirtualKeyboardInputEngine::InputMode::Pinyin && !d->pinyinDecoderService)
         return false;
     d->inputMode = inputMode;
     return true;
@@ -406,7 +406,7 @@ bool PinyinInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardM
 {
     Q_UNUSED(modifiers)
     Q_D(PinyinInputMethod);
-    if (d->inputMode == QVirtualKeyboardInputEngine::Pinyin) {
+    if (d->inputMode == QVirtualKeyboardInputEngine::InputMode::Pinyin) {
         ScopedCandidateListUpdate scopedCandidateListUpdate(d);
         Q_UNUSED(scopedCandidateListUpdate)
         if ((key >= Qt::Key_A && key <= Qt::Key_Z) || (key == Qt::Key_Apostrophe)) {
@@ -442,7 +442,7 @@ bool PinyinInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardM
 
 QList<QVirtualKeyboardSelectionListModel::Type> PinyinInputMethod::selectionLists()
 {
-    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList;
+    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::Type::WordCandidateList;
 }
 
 int PinyinInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type)
@@ -452,16 +452,16 @@ int PinyinInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel
     return d->candidatesCount();
 }
 
-QVariant PinyinInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant PinyinInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     QVariant result;
     Q_UNUSED(type)
     Q_D(PinyinInputMethod);
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         result = QVariant(d->candidateAt(index));
         break;
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
         result.setValue(0);
         break;
     default:
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod_p.h b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
index e5cf6926..b5eb242a 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod_p.h
+++ b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
@@ -65,7 +65,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
 
     void reset();
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
index 5da72eea..6519159e 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
@@ -88,11 +88,11 @@ public:
     QString formatString(const QString &str) const
     {
         QString result;
-        QVirtualKeyboardInputEngine::TextCase textCase = QVirtualKeyboardInputEngine::Lower;
+        QVirtualKeyboardInputEngine::TextCase textCase = QVirtualKeyboardInputEngine::TextCase::Lower;
         for (int i = 0; i < str.length(); ++i) {
             if (i < textCaseList.length())
                 textCase = textCaseList.at(i);
-            result.append(textCase == QVirtualKeyboardInputEngine::Upper ? str.at(i).toUpper() : (preferLowercase ? str.at(i).toLower() : str.at(i)));
+            result.append(textCase == QVirtualKeyboardInputEngine::TextCase::Upper ? str.at(i).toUpper() : (preferLowercase ? str.at(i).toLower() : str.at(i)));
         }
         return result;
     }
@@ -136,7 +136,7 @@ public:
         activeWordIndex(-1),
         arcAdditionStarted(false),
         ignoreUpdate(false),
-        textCase(QVirtualKeyboardInputEngine::Lower)
+        textCase(QVirtualKeyboardInputEngine::TextCase::Lower)
 #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT
         , unipenTrace()
 #endif
@@ -661,24 +661,24 @@ public:
 
         DECUMA_UINT32 language = languageMap[localeLanguage];
         if (language == DECUMA_LANG_PRC) {
-            if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting)
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting)
                 language = DECUMA_LANG_EN;
             else if (locale.script() == QLocale::TraditionalChineseScript)
                 language = (locale.country() == QLocale::HongKong) ? DECUMA_LANG_HK : DECUMA_LANG_TW;
         } else if (language == DECUMA_LANG_JP) {
-            if (inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting)
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting)
                 language = DECUMA_LANG_EN;
         } else if (language == DECUMA_LANG_KO) {
-            if (inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting)
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting)
                 language = DECUMA_LANG_EN;
         } else if (language == DECUMA_LANG_SRCY) {
-            if (inputMode != QVirtualKeyboardInputEngine::Cyrillic)
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::Cyrillic)
                 language = DECUMA_LANG_SRLA;
         } else if (language == DECUMA_LANG_AR || language == DECUMA_LANG_FA) {
-            if (inputMode != QVirtualKeyboardInputEngine::Arabic && inputMode != QVirtualKeyboardInputEngine::Numeric)
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::Arabic && inputMode != QVirtualKeyboardInputEngine::InputMode::Numeric)
                 language = DECUMA_LANG_EN;
         } else if (language == DECUMA_LANG_IW) {
-            if (inputMode != QVirtualKeyboardInputEngine::Hebrew)
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::Hebrew)
                 language = DECUMA_LANG_EN;
         }
 
@@ -701,7 +701,7 @@ public:
 #if T9WRITEAPIMAJORVERNUM >= 21
         if (!cjk) {
             switch (inputMode) {
-            case QVirtualKeyboardInputEngine::Latin:
+            case QVirtualKeyboardInputEngine::InputMode::Latin:
                 switch (language) {
                 case DECUMA_LANG_EN:
                 case DECUMA_LANG_FR:
@@ -714,7 +714,7 @@ public:
                     break;
                 }
                 break;
-            case QVirtualKeyboardInputEngine::Arabic:
+            case QVirtualKeyboardInputEngine::InputMode::Arabic:
                 sessionSettings.recognitionMode = ucrMode;
                 break;
             default:
@@ -724,9 +724,9 @@ public:
 #endif
 
         // Use scrMode with hidden text or with no predictive mode
-        if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting &&
-                inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting &&
-                inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) {
+        if (inputMode != QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting &&
+                inputMode != QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting &&
+                inputMode != QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting) {
             const Qt::InputMethodHints inputMethodHints = q->inputContext()->inputMethodHints();
             if (inputMethodHints.testFlag(Qt::ImhHiddenText) || inputMethodHints.testFlag(Qt::ImhNoPredictiveText))
                 sessionSettings.recognitionMode = scrMode;
@@ -747,7 +747,7 @@ public:
         Q_Q(T9WriteInputMethod);
         const Qt::InputMethodHints inputMethodHints = q->inputContext()->inputMethodHints();
         switch (inputMode) {
-        case QVirtualKeyboardInputEngine::Latin:
+        case QVirtualKeyboardInputEngine::InputMode::Latin:
             if (inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) {
                 symbolCategories.append(DECUMA_CATEGORY_EMAIL);
             } else if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly)) {
@@ -768,7 +768,7 @@ public:
             }
             break;
 
-        case QVirtualKeyboardInputEngine::Numeric:
+        case QVirtualKeyboardInputEngine::InputMode::Numeric:
             if (language == DECUMA_LANG_AR || language == DECUMA_LANG_FA) {
                 symbolCategories.append(DECUMA_CATEGORY_ARABIC_NUM_MODE);
                 symbolCategories.append(DECUMA_CATEGORY_ARABIC_GESTURES);
@@ -780,11 +780,11 @@ public:
                 symbolCategories.append(DECUMA_CATEGORY_NUM_SUP);
             break;
 
-        case QVirtualKeyboardInputEngine::Dialable:
+        case QVirtualKeyboardInputEngine::InputMode::Dialable:
             symbolCategories.append(DECUMA_CATEGORY_PHONE_NUMBER);
             break;
 
-        case QVirtualKeyboardInputEngine::Greek:
+        case QVirtualKeyboardInputEngine::InputMode::Greek:
             symbolCategories.append(DECUMA_CATEGORY_GREEK);
             symbolCategories.append(DECUMA_CATEGORY_QUEST_EXCL_MARK_PUNCTUATIONS);
             symbolCategories.append(DECUMA_CATEGORY_PERIOD_COMMA_PUNCTUATIONS);
@@ -793,7 +793,7 @@ public:
             symbolCategories.append(DECUMA_CATEGORY_CONTRACTION_MARK);
             break;
 
-        case QVirtualKeyboardInputEngine::Cyrillic:
+        case QVirtualKeyboardInputEngine::InputMode::Cyrillic:
             symbolCategories.append(DECUMA_CATEGORY_CYRILLIC);
             symbolCategories.append(DECUMA_CATEGORY_QUEST_EXCL_MARK_PUNCTUATIONS);
             symbolCategories.append(DECUMA_CATEGORY_PERIOD_COMMA_PUNCTUATIONS);
@@ -802,13 +802,13 @@ public:
                 symbolCategories.append(DECUMA_CATEGORY_CONTRACTION_MARK);
             break;
 
-        case QVirtualKeyboardInputEngine::Arabic:
+        case QVirtualKeyboardInputEngine::InputMode::Arabic:
             symbolCategories.append(DECUMA_CATEGORY_ARABIC_ISOLATED_LETTER_MODE);
             symbolCategories.append(DECUMA_CATEGORY_ARABIC_GESTURES);
             leftToRightGestures = false;
             break;
 
-        case QVirtualKeyboardInputEngine::Hebrew:
+        case QVirtualKeyboardInputEngine::InputMode::Hebrew:
             symbolCategories.append(DECUMA_CATEGORY_HEBREW_GL_HEBREW_CURSIVE_MODE);
             symbolCategories.append(DECUMA_CATEGORY_HEBREW_GL_HEBREW_LETTERSYMBOLS);
             symbolCategories.append(DECUMA_CATEGORY_HEBREW_SHEQEL);
@@ -838,24 +838,24 @@ public:
         symbolCategories.clear();
 
         switch (inputMode) {
-        case QVirtualKeyboardInputEngine::Latin:
+        case QVirtualKeyboardInputEngine::InputMode::Latin:
             symbolCategories.append(DECUMA_CATEGORY_ANSI);
             symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL);
             symbolCategories.append(DECUMA_CATEGORY_PUNCTUATIONS);
             break;
 
-        case QVirtualKeyboardInputEngine::Numeric:
+        case QVirtualKeyboardInputEngine::InputMode::Numeric:
             symbolCategories.append(DECUMA_CATEGORY_DIGIT);
             symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL);
             symbolCategories.append(DECUMA_CATEGORY_PUNCTUATIONS);
             break;
 
-        case QVirtualKeyboardInputEngine::Dialable:
+        case QVirtualKeyboardInputEngine::InputMode::Dialable:
             symbolCategories.append(DECUMA_CATEGORY_DIGIT);
             symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL);
             break;
 
-        case QVirtualKeyboardInputEngine::ChineseHandwriting:
+        case QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting:
             switch (locale.script()) {
             case QLocale::SimplifiedChineseScript:
                 symbolCategories.append(DECUMA_CATEGORY_GB2312_A);
@@ -882,7 +882,7 @@ public:
             }
             break;
 
-        case QVirtualKeyboardInputEngine::JapaneseHandwriting:
+        case QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting:
             symbolCategories.append(DECUMA_CATEGORY_JIS_LEVEL_1);
             symbolCategories.append(DECUMA_CATEGORY_JIS_LEVEL_2);
             symbolCategories.append(DECUMA_CATEGORY_HIRAGANA);
@@ -894,7 +894,7 @@ public:
             symbolCategories.append(DECUMA_CATEGORY_PUNCTUATIONS);
             break;
 
-        case QVirtualKeyboardInputEngine::KoreanHandwriting:
+        case QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting:
             symbolCategories.append(DECUMA_CATEGORY_HANGUL_1001_A);
             symbolCategories.append(DECUMA_CATEGORY_HANGUL_1001_B);
             symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL);
@@ -1026,8 +1026,8 @@ public:
             stringStart = preeditText;
             wordCandidates.append(preeditText);
             activeWordIndex = 0;
-            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
         }
 
         const int dpi = traceCaptureDeviceInfo.value("dpi", 96).toInt();
@@ -1238,8 +1238,8 @@ public:
             activeWordIndex = -1;
             if (emitSelectionListChanged) {
                 Q_Q(T9WriteInputMethod);
-                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
             }
             result = true;
         }
@@ -1283,7 +1283,7 @@ public:
                 if (finalWord.length() == 1) {
                     // In recording mode, the text case must match with the current text case
                     QChar ch(finalWord.at(0));
-                    if (!ch.isLetter() || (ch.isUpper() == (textCase == QVirtualKeyboardInputEngine::Upper))) {
+                    if (!ch.isLetter() || (ch.isUpper() == (textCase == QVirtualKeyboardInputEngine::TextCase::Upper))) {
                         QStringList homeLocations = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
                         if (!homeLocations.isEmpty()) {
                             unipenTrace->setDirectory(QStringLiteral("%1/%2").arg(homeLocations.at(0)).arg("VIRTUAL_KEYBOARD_TRACES"));
@@ -1359,7 +1359,7 @@ public:
                 if (i == 0) {
                     if (ic->shift()) {
                         caseFormatter.ensureLength(1, textCase);
-                        caseFormatter.ensureLength(resultChars.length(), QVirtualKeyboardInputEngine::Lower);
+                        caseFormatter.ensureLength(resultChars.length(), QVirtualKeyboardInputEngine::TextCase::Lower);
                     } else {
                         caseFormatter.ensureLength(resultChars.length(), textCase);
                     }
@@ -1420,9 +1420,9 @@ public:
 
             const QVirtualKeyboardInputEngine::InputMode inputMode = q->inputEngine()->inputMode();
             if (sessionSettings.recognitionMode == mcrMode && !symbolStrokes.isEmpty() &&
-                    inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting &&
-                    inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting &&
-                    inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) {
+                    inputMode != QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting &&
+                    inputMode != QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting &&
+                    inputMode != QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting) {
                 int activeTraces = symbolStrokes.at(symbolStrokes.count() - 1).toInt();
                 if (symbolStrokes.count() > 1)
                     activeTraces += symbolStrokes.at(symbolStrokes.count() - 2).toInt();
@@ -1462,8 +1462,8 @@ public:
             wordCandidates = newWordCandidates;
             wordCandidatesHwrResultIndex = newWordCandidatesHwrResultIndex;
             activeWordIndex = wordCandidates.isEmpty() ? -1 : 0;
-            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex);
+            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, activeWordIndex);
         }
 
         if (arcAdditionStarted && traceList.isEmpty() && worker->numberOfPendingTasks() == 0) {
@@ -1550,9 +1550,9 @@ public:
 
                 // Swipe right
                 const QVirtualKeyboardInputEngine::InputMode inputMode = q->inputEngine()->inputMode();
-                if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting &&
-                        inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting &&
-                        inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) {
+                if (inputMode != QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting &&
+                        inputMode != QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting &&
+                        inputMode != QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting) {
                     if (swipeAngle <= SWIPE_ANGLE_THRESHOLD || swipeAngle >= 360 - SWIPE_ANGLE_THRESHOLD) {
                         if (swipeTouchCount == 1) {
                             // Single swipe: space
@@ -1571,17 +1571,17 @@ public:
                         if (!(ic->inputMethodHints() & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly))) {
                             QList<int> inputModes = ic->inputEngine()->inputModes();
                             // Filter out duplicate numeric mode (in favor of Numeric)
-                            int indexOfNumericInputMode = inputModes.indexOf(QVirtualKeyboardInputEngine::Numeric);
-                            int indexOfDialableInputMode = inputModes.indexOf(QVirtualKeyboardInputEngine::Dialable);
+                            int indexOfNumericInputMode = inputModes.indexOf(static_cast<const int>(QVirtualKeyboardInputEngine::InputMode::Numeric));
+                            int indexOfDialableInputMode = inputModes.indexOf(static_cast<const int>(QVirtualKeyboardInputEngine::InputMode::Dialable));
                             if (indexOfNumericInputMode != -1 && indexOfDialableInputMode != -1)
-                                inputModes.removeAt(inputMode != QVirtualKeyboardInputEngine::Dialable ?
+                                inputModes.removeAt(inputMode != QVirtualKeyboardInputEngine::InputMode::Dialable ?
                                             indexOfDialableInputMode :
                                             indexOfNumericInputMode);
                             if (inputModes.count() > 1) {
-                                int inputModeIndex = inputModes.indexOf((int)inputMode) + 1;
+                                int inputModeIndex = inputModes.indexOf(static_cast<const int>(inputMode)) + 1;
                                 if (inputModeIndex >= inputModes.count())
                                     inputModeIndex = 0;
-                                ic->inputEngine()->setInputMode((QVirtualKeyboardInputEngine::InputMode)inputModes.at(inputModeIndex));
+                                ic->inputEngine()->setInputMode(static_cast<QVirtualKeyboardInputEngine::InputMode>(inputModes.at(inputModeIndex)));
                             }
                         }
                         return true;
@@ -1704,28 +1704,28 @@ QList<QVirtualKeyboardInputEngine::InputMode> T9WriteInputMethod::inputModes(con
         if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) {
             switch (loc.script()) {
             case QLocale::GreekScript:
-                availableInputModes.append(QVirtualKeyboardInputEngine::Greek);
+                availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Greek);
                 break;
             case QLocale::CyrillicScript:
-                availableInputModes.append(QVirtualKeyboardInputEngine::Cyrillic);
+                availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Cyrillic);
                 break;
             default:
                 break;
             }
-            availableInputModes.append(QVirtualKeyboardInputEngine::Latin);
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Latin);
         }
         break;
     case T9WriteInputMethodPrivate::Arabic:
         if (d->findHwrDb(T9WriteInputMethodPrivate::Arabic, d->defaultHwrDbPath).isEmpty())
             return availableInputModes;
         if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly)))
-            availableInputModes.append(QVirtualKeyboardInputEngine::Arabic);
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Arabic);
         break;
     case T9WriteInputMethodPrivate::Hebrew:
         if (d->findHwrDb(T9WriteInputMethodPrivate::Hebrew, d->defaultHwrDbPath).isEmpty())
             return availableInputModes;
         if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly)))
-            availableInputModes.append(QVirtualKeyboardInputEngine::Hebrew);
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Hebrew);
         break;
 #endif
 #ifdef HAVE_T9WRITE_CJK
@@ -1735,19 +1735,19 @@ QList<QVirtualKeyboardInputEngine::InputMode> T9WriteInputMethod::inputModes(con
         if (d->findHwrDb(mode, d->defaultHwrDbPath).isEmpty())
             return availableInputModes;
         if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly)))
-            availableInputModes.append(QVirtualKeyboardInputEngine::ChineseHandwriting);
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting);
         break;
     case T9WriteInputMethodPrivate::Japanese:
         if (d->findHwrDb(T9WriteInputMethodPrivate::Japanese, d->defaultHwrDbPath).isEmpty())
             return availableInputModes;
         if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly)))
-            availableInputModes.append(QVirtualKeyboardInputEngine::JapaneseHandwriting);
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting);
         break;
     case T9WriteInputMethodPrivate::Korean:
         if (d->findHwrDb(T9WriteInputMethodPrivate::Korean, d->defaultHwrDbPath).isEmpty())
             return availableInputModes;
         if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly)))
-            availableInputModes.append(QVirtualKeyboardInputEngine::KoreanHandwriting);
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting);
         break;
 #endif
     default:
@@ -1756,17 +1756,17 @@ QList<QVirtualKeyboardInputEngine::InputMode> T9WriteInputMethod::inputModes(con
 
     // Add exclusive input modes
     if (inputMethodHints.testFlag(Qt::ImhDialableCharactersOnly) || inputMethodHints.testFlag(Qt::ImhDigitsOnly)) {
-        availableInputModes.append(QVirtualKeyboardInputEngine::Dialable);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Dialable);
     } else if (inputMethodHints.testFlag(Qt::ImhFormattedNumbersOnly)) {
-        availableInputModes.append(QVirtualKeyboardInputEngine::Numeric);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Numeric);
     } else if (inputMethodHints.testFlag(Qt::ImhLatinOnly)) {
-        availableInputModes.append(QVirtualKeyboardInputEngine::Latin);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Latin);
     } else {
         // Add other input modes
         Q_ASSERT(!availableInputModes.isEmpty());
-        if (!availableInputModes.contains(QVirtualKeyboardInputEngine::Latin))
-            availableInputModes.append(QVirtualKeyboardInputEngine::Latin);
-        availableInputModes.append(QVirtualKeyboardInputEngine::Numeric);
+        if (!availableInputModes.contains(QVirtualKeyboardInputEngine::InputMode::Latin))
+            availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Latin);
+        availableInputModes.append(QVirtualKeyboardInputEngine::InputMode::Numeric);
     }
 
     return availableInputModes;
@@ -1821,8 +1821,8 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard
                 d->stringStart = preeditText;
                 d->wordCandidates.append(preeditText);
                 d->activeWordIndex = 0;
-                emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->activeWordIndex);
+                emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->activeWordIndex);
                 return true;
             } else {
                 bool result = !preeditText.isEmpty();
@@ -1853,8 +1853,8 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard
                 d->stringStart = preeditText;
                 d->wordCandidates.append(preeditText);
                 d->activeWordIndex = 0;
-                emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->activeWordIndex);
+                emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->activeWordIndex);
                 return true;
             } else {
                 ic->commit();
@@ -1885,7 +1885,7 @@ void T9WriteInputMethod::update()
 
 QList<QVirtualKeyboardSelectionListModel::Type> T9WriteInputMethod::selectionLists()
 {
-    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList;
+    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::Type::WordCandidateList;
 }
 
 int T9WriteInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type)
@@ -1895,15 +1895,15 @@ int T9WriteInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListMode
     return d->wordCandidates.count();
 }
 
-QVariant T9WriteInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant T9WriteInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     QVariant result;
     Q_D(T9WriteInputMethod);
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         result = QVariant(d->wordCandidates.at(index));
         break;
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
         result.setValue(0);
         break;
     default:
@@ -1923,7 +1923,7 @@ void T9WriteInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionList
 QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> T9WriteInputMethod::patternRecognitionModes() const
 {
     return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>()
-            << QVirtualKeyboardInputEngine::HandwritingRecoginition;
+            << QVirtualKeyboardInputEngine::PatternRecognitionMode::Handwriting;
 }
 
 QVirtualKeyboardTrace *T9WriteInputMethod::traceBegin(
@@ -1953,13 +1953,13 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInpu
         return false;
 
     const QVirtualKeyboardInputEngine::InputMode inputMode = inputEngine()->inputMode();
-    const int maxLength = (inputMode == QVirtualKeyboardInputEngine::ChineseHandwriting ||
-            inputMode == QVirtualKeyboardInputEngine::JapaneseHandwriting ||
-            inputMode == QVirtualKeyboardInputEngine::KoreanHandwriting) ? 0 : 32;
+    const int maxLength = (inputMode == QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting ||
+            inputMode == QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting ||
+            inputMode == QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting) ? 0 : 32;
     const QString surroundingText = ic->surroundingText();
     int replaceFrom = 0;
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordBeforeCursor)) {
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordBeforeCursor)) {
         for (int i = cursorPosition - 1; i >= 0 && d->stringStart.length() < maxLength; --i) {
             QChar c = surroundingText.at(i);
             if (!d->isValidInputChar(c))
@@ -1974,12 +1974,12 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInpu
         }
     }
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == 0) {
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordAtCursor) && replaceFrom == 0) {
         d->stringStart.clear();
         return false;
     }
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAfterCursor)) {
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordAfterCursor)) {
         for (int i = cursorPosition; i < surroundingText.length() && d->stringStart.length() < maxLength; ++i) {
             QChar c = surroundingText.at(i);
             if (!d->isValidInputChar(c))
@@ -1998,7 +1998,7 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInpu
     if (d->stringStart.isEmpty())
         return false;
 
-    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == -d->stringStart.length() && d->stringStart.length() < maxLength) {
+    if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::ReselectFlag::WordAtCursor) && replaceFrom == -d->stringStart.length() && d->stringStart.length() < maxLength) {
         d->stringStart.clear();
         return false;
     }
@@ -2015,11 +2015,11 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInpu
 
     ic->setPreeditText(d->stringStart, QList<QInputMethodEvent::Attribute>(), replaceFrom, d->stringStart.length());
     for (int i = 0; i < d->stringStart.length(); ++i)
-        d->caseFormatter.ensureLength(i + 1, d->stringStart.at(i).isUpper() ? QVirtualKeyboardInputEngine::Upper : QVirtualKeyboardInputEngine::Lower);
+        d->caseFormatter.ensureLength(i + 1, d->stringStart.at(i).isUpper() ? QVirtualKeyboardInputEngine::TextCase::Upper : QVirtualKeyboardInputEngine::TextCase::Lower);
     d->wordCandidates.append(d->stringStart);
     d->activeWordIndex = 0;
-    emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->activeWordIndex);
+    emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->activeWordIndex);
 
     return true;
 }
@@ -2050,9 +2050,9 @@ void T9WriteInputMethod::timerEvent(QTimerEvent *timerEvent)
             }
 
             const QVirtualKeyboardInputEngine::InputMode inputMode = inputEngine()->inputMode();
-            if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting &&
-                    inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting &&
-                    inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) {
+            if (inputMode != QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting &&
+                    inputMode != QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting &&
+                    inputMode != QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting) {
                 d->clearTraces();
             }
 #endif
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod_p.h b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
index ecfb3ec4..e5b9d3a5 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod_p.h
+++ b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
@@ -70,7 +70,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
 
     QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const;
diff --git a/src/plugins/tcime/plugin/tcinputmethod.cpp b/src/plugins/tcime/plugin/tcinputmethod.cpp
index 74f17597..e347979a 100644
--- a/src/plugins/tcime/plugin/tcinputmethod.cpp
+++ b/src/plugins/tcime/plugin/tcinputmethod.cpp
@@ -58,7 +58,7 @@ public:
 
     TCInputMethodPrivate(TCInputMethod *q_ptr) :
         q_ptr(q_ptr),
-        inputMode(QVirtualKeyboardInputEngine::Latin),
+        inputMode(QVirtualKeyboardInputEngine::InputMode::Latin),
         wordDictionary(nullptr),
         highlightIndex(-1)
     {}
@@ -90,8 +90,8 @@ public:
     {
         if (clearCandidates()) {
             Q_Q(TCInputMethod);
-            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex);
+            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, highlightIndex);
         }
         input.clear();
     }
@@ -104,12 +104,12 @@ public:
         switch (inputMode)
         {
 #if defined(HAVE_TCIME_CANGJIE)
-        case QVirtualKeyboardInputEngine::Cangjie:
+        case QVirtualKeyboardInputEngine::InputMode::Cangjie:
             accept = composeCangjie(ic, c);
             break;
 #endif
 #if defined(HAVE_TCIME_ZHUYIN)
-        case QVirtualKeyboardInputEngine::Zhuyin:
+        case QVirtualKeyboardInputEngine::InputMode::Zhuyin:
             accept = composeZhuyin(ic, c);
             break;
 #endif
@@ -130,8 +130,8 @@ public:
                 ic->setPreeditText(input);
                 if (setCandidates(wordDictionary->getWords(input), true)) {
                     Q_Q(TCInputMethod);
-                    emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                    emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex);
+                    emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                    emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, highlightIndex);
                 }
             }
             accept = true;
@@ -170,8 +170,8 @@ public:
                     << QChar(0xFE5B) << QChar(0xFE5C) << QChar(0xFE43) << QChar(0xFE44);
             Q_Q(TCInputMethod);
             if (setCandidates(specialChars1, true)) {
-                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex);
+                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, highlightIndex);
             }
             q->inputContext()->setPreeditText(candidates[highlightIndex]);
             return true;
@@ -188,8 +188,8 @@ public:
                     << QChar(0xFE4F) << QChar(0xFE34) << QChar(0xFE33);
             Q_Q(TCInputMethod);
             if (setCandidates(specialChars2, true)) {
-                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex);
+                emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, highlightIndex);
             }
             q->inputContext()->setPreeditText(candidates[highlightIndex]);
             return true;
@@ -251,8 +251,8 @@ public:
         ic->setPreeditText(input);
         if (setCandidates(wordDictionary->getWords(input), true)) {
             Q_Q(TCInputMethod);
-            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex);
+            emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+            emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, highlightIndex);
         }
 
         return true;
@@ -353,10 +353,10 @@ QList<QVirtualKeyboardInputEngine::InputMode> TCInputMethod::inputModes(const QS
     Q_UNUSED(locale)
     return QList<QVirtualKeyboardInputEngine::InputMode>()
 #if defined(HAVE_TCIME_ZHUYIN)
-            << QVirtualKeyboardInputEngine::Zhuyin
+            << QVirtualKeyboardInputEngine::InputMode::Zhuyin
 #endif
 #if defined(HAVE_TCIME_CANGJIE)
-           << QVirtualKeyboardInputEngine::Cangjie
+           << QVirtualKeyboardInputEngine::InputMode::Cangjie
 #endif
                ;
 }
@@ -372,7 +372,7 @@ bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEng
     d->inputMode = inputMode;
     d->wordDictionary = nullptr;
 #if defined(HAVE_TCIME_CANGJIE)
-    if (inputMode == QVirtualKeyboardInputEngine::Cangjie) {
+    if (inputMode == QVirtualKeyboardInputEngine::InputMode::Cangjie) {
         if (d->cangjieDictionary.isEmpty()) {
             QString cangjieDictionary(qEnvironmentVariable("QT_VIRTUALKEYBOARD_CANGJIE_DICTIONARY"));
             if (!QFileInfo::exists(cangjieDictionary)) {
@@ -386,7 +386,7 @@ bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEng
     }
 #endif
 #if defined(HAVE_TCIME_ZHUYIN)
-    if (inputMode == QVirtualKeyboardInputEngine::Zhuyin) {
+    if (inputMode == QVirtualKeyboardInputEngine::InputMode::Zhuyin) {
         if (d->zhuyinDictionary.isEmpty()) {
             QString zhuyinDictionary(qEnvironmentVariable("QT_VIRTUALKEYBOARD_ZHUYIN_DICTIONARY"));
             if (!QFileInfo::exists(zhuyinDictionary)) {
@@ -410,7 +410,7 @@ bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEng
         d->phraseDictionary.load(phraseDictionary);
     }
     if (!result)
-        inputMode = QVirtualKeyboardInputEngine::Latin;
+        inputMode = QVirtualKeyboardInputEngine::InputMode::Latin;
     return result;
 }
 
@@ -448,8 +448,8 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif
                 d->reset();
                 inputContext()->commit(finalWord);
                 if (d->setCandidates(d->phraseDictionary.getWords(finalWord.left(1)), false)) {
-                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex);
+                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->highlightIndex);
                 }
             }
         } else {
@@ -465,16 +465,16 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif
             if (!d->checkSpecialCharInput()) {
 #endif
                 if (d->setCandidates(d->wordDictionary->getWords(d->input), true)) {
-                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex);
+                    emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+                    emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->highlightIndex);
                 }
 #if defined(HAVE_TCIME_CANGJIE)
             }
 #endif
             accept = true;
         } else if (d->clearCandidates()) {
-            emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-            emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex);
+            emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+            emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->highlightIndex);
         }
         break;
 
@@ -490,7 +490,7 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif
 
 QList<QVirtualKeyboardSelectionListModel::Type> TCInputMethod::selectionLists()
 {
-    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList;
+    return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::Type::WordCandidateList;
 }
 
 int TCInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type)
@@ -500,15 +500,15 @@ int TCInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Ty
     return d->candidates.count();
 }
 
-QVariant TCInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant TCInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     QVariant result;
     Q_D(TCInputMethod);
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         result = QVariant(d->candidates.at(index));
         break;
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
         result.setValue(0);
         break;
     default:
@@ -526,8 +526,8 @@ void TCInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel
     reset();
     inputContext()->commit(finalWord);
     if (d->setCandidates(d->phraseDictionary.getWords(finalWord.left(1)), false)) {
-        emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList);
-        emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex);
+        emit selectionListChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
+        emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type::WordCandidateList, d->highlightIndex);
     }
 }
 
diff --git a/src/plugins/tcime/plugin/tcinputmethod_p.h b/src/plugins/tcime/plugin/tcinputmethod_p.h
index 10a962e5..5915c3ab 100644
--- a/src/plugins/tcime/plugin/tcinputmethod_p.h
+++ b/src/plugins/tcime/plugin/tcinputmethod_p.h
@@ -69,7 +69,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
 
     void reset();
diff --git a/src/plugins/thai/plugin/thaiinputmethod.cpp b/src/plugins/thai/plugin/thaiinputmethod.cpp
index 7d1561e0..65edec1c 100644
--- a/src/plugins/thai/plugin/thaiinputmethod.cpp
+++ b/src/plugins/thai/plugin/thaiinputmethod.cpp
@@ -49,7 +49,7 @@ QList<QVirtualKeyboardInputEngine::InputMode> ThaiInputMethod::inputModes(
         const QString &locale)
 {
     Q_UNUSED(locale)
-    return QList<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Latin;
+    return QList<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::Latin;
 }
 
 bool ThaiInputMethod::setInputMode(const QString &locale,
diff --git a/src/styles/KeyboardStyle.qml b/src/styles/KeyboardStyle.qml
index 1d1c8222..c3a6f4dd 100644
--- a/src/styles/KeyboardStyle.qml
+++ b/src/styles/KeyboardStyle.qml
@@ -261,6 +261,8 @@ QtObject {
         \list
             \li \c display Display text for the current item.
             \li \c wordCompletionLength Word completion length measured from the end of the display text.
+            \li \c dictionary Dictionary type of the word, see QVirtualKeyboardSelectionListModel::DictionaryType.
+            \li \c canRemoveSuggestion A boolean indicating if the word can be removed from dictionary.
         \endlist
     */
     property Component selectionListDelegate: null
@@ -330,6 +332,8 @@ QtObject {
         \list
             \li \c display Display text for the current item.
             \li \c wordCompletionLength Word completion length measured from the end of the display text.
+            \li \c dictionary Dictionary type of the word, see QVirtualKeyboardSelectionListModel::DictionaryType.
+            \li \c canRemoveSuggestion A boolean indicating if the word can be removed from dictionary.
         \endlist
     */
     property Component popupListDelegate: null
@@ -381,8 +385,7 @@ QtObject {
 
         The following properties are available to the item:
         \list
-            \li \c display Display text for the current item.
-            \li \c wordCompletionLength Word completion length measured from the end of the display text.
+            \li \c displayName Display name of the language.
         \endlist
     */
     property Component languageListDelegate: null
diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/content/HandwritingInputPanel.qml
index 67bf0706..58800a6c 100644
--- a/src/virtualkeyboard/content/HandwritingInputPanel.qml
+++ b/src/virtualkeyboard/content/HandwritingInputPanel.qml
@@ -105,7 +105,7 @@ Item {
         enabled: handwritingInputPanel.enabled && handwritingInputPanel.available && handwritingInputPanel.active
         objectName: "hwrInputArea"
         anchors.fill: parent
-        patternRecognitionMode: InputEngine.HandwritingRecoginition
+        patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
         canvasType: "fullscreen"
     }
 
diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/virtualkeyboard/content/components/InputModeKey.qml
index 68255d9e..6ac04422 100644
--- a/src/virtualkeyboard/content/components/InputModeKey.qml
+++ b/src/virtualkeyboard/content/components/InputModeKey.qml
@@ -58,23 +58,23 @@ Key {
         The default list contains all known input modes for \l {QVirtualKeyboardInputEngine::inputMode} {InputEngine.inputMode}.
     */
     property var inputModeNameList: [
-        "ABC",  // InputEngine.Latin
-        "123",  // InputEngine.Numeric
-        "123",  // InputEngine.Dialable
-        "拼音",  // InputEngine.Pinyin
-        "倉頡",  // InputEngine.Cangjie
-        "注音",  // InputEngine.Zhuyin
-        "한글",  // InputEngine.Hangul
-        "あ",    // InputEngine.Hiragana
-        "カ",    // InputEngine.Katakana
-        "全角",  // InputEngine.FullwidthLatin
-        "ΑΒΓ",  // InputEngine.Greek
-        "АБВ",  // InputEngine.Cyrillic
-        "\u0623\u200C\u0628\u200C\u062C",  // InputEngine.Arabic
-        "\u05D0\u05D1\u05D2",  // InputEngine.Hebrew
-        "中文",  // InputEngine.ChineseHandwriting
-        "日本語", // InputEngine.JapaneseHandwriting
-        "한국어", // InputEngine.KoreanHandwriting
+        "ABC",  // InputEngine.InputMode.Latin
+        "123",  // InputEngine.InputMode.Numeric
+        "123",  // InputEngine.InputMode.Dialable
+        "拼音",  // InputEngine.InputMode.Pinyin
+        "倉頡",  // InputEngine.InputMode.Cangjie
+        "注音",  // InputEngine.InputMode.Zhuyin
+        "한글",  // InputEngine.InputMode.Hangul
+        "あ",    // InputEngine.InputMode.Hiragana
+        "カ",    // InputEngine.InputMode.Katakana
+        "全角",  // InputEngine.InputMode.FullwidthLatin
+        "ΑΒΓ",  // InputEngine.InputMode.Greek
+        "АБВ",  // InputEngine.InputMode.Cyrillic
+        "\u0623\u200C\u0628\u200C\u062C",  // InputEngine.InputMode.Arabic
+        "\u05D0\u05D1\u05D2",  // InputEngine.InputMode.Hebrew
+        "中文",  // InputEngine.InputMode.ChineseHandwriting
+        "日本語", // InputEngine.InputMode.JapaneseHandwriting
+        "한국어", // InputEngine.InputMode.KoreanHandwriting
     ]
 
     /*!
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index 1290502e..bd885f73 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -73,7 +73,7 @@ Item {
     property var plainInputMethod: PlainInputMethod {}
     property var customInputMethod: null
     property var customInputMethodSharedLayouts: []
-    property int defaultInputMode: InputEngine.Latin
+    property int defaultInputMode: InputEngine.InputMode.Latin
     property bool inputMethodNeedsReset: true
     property bool inputModeNeedsReset: true
     property bool navigationModeActive: false
@@ -1217,16 +1217,16 @@ Item {
 
             wordCandidateContextMenuListModel.clear()
 
-            var canRemoveSuggestion = wordCandidateView.model.dataAt(wordCandidateIndex, SelectionListModel.CanRemoveSuggestionRole)
+            var canRemoveSuggestion = wordCandidateView.model.dataAt(wordCandidateIndex, SelectionListModel.Role.CanRemoveSuggestion)
             if (canRemoveSuggestion) {
-                var dictionaryType = wordCandidateView.model.dataAt(wordCandidateIndex, SelectionListModel.DictionaryTypeRole)
+                var dictionaryType = wordCandidateView.model.dataAt(wordCandidateIndex, SelectionListModel.Role.Dictionary)
                 var removeItemText;
                 switch (dictionaryType) {
-                case SelectionListModel.UserDictionary:
+                case SelectionListModel.DictionaryType.User:
                     //~ VirtualKeyboard Context menu for word suggestion if it can be removed from the user dictionary.
                     removeItemText = qsTr("Remove from dictionary")
                     break
-                case SelectionListModel.DefaultDictionary:
+                case SelectionListModel.DictionaryType.Default:
                     // Fallthrough
                 default:
                     //~ VirtualKeyboard Context menu for word suggestion if it can be removed from the default dictionary.
@@ -1340,19 +1340,19 @@ Item {
 
                     // Update input mode automatically in handwriting mode
                     if (keyboard.handwritingMode) {
-                        if (keyboard.dialableCharactersOnly && inputModes.indexOf(InputEngine.Dialable) !== -1)
-                            inputMode = InputEngine.Dialable
-                        else if ((keyboard.formattedNumbersOnly || keyboard.digitsOnly) && inputModes.indexOf(InputEngine.Numeric) !== -1)
-                            inputMode = InputEngine.Numeric
+                        if (keyboard.dialableCharactersOnly && inputModes.indexOf(InputEngine.InputMode.Dialable) !== -1)
+                            inputMode = InputEngine.InputMode.Dialable
+                        else if ((keyboard.formattedNumbersOnly || keyboard.digitsOnly) && inputModes.indexOf(InputEngine.InputMode.Numeric) !== -1)
+                            inputMode = InputEngine.InputMode.Numeric
                         else if (keyboardLayoutLoader.item.inputMode === -1)
                             inputMode = inputModes[0]
                     }
 
                     // Check the input method hints for input mode overrides
                     if (latinOnly)
-                        inputMode = InputEngine.Latin
+                        inputMode = InputEngine.InputMode.Latin
                     if (preferNumbers)
-                        inputMode = InputEngine.Numeric
+                        inputMode = InputEngine.InputMode.Numeric
                 }
 
                 // Make sure the input mode is supported by the current input method
diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml
index b0aa8129..3c14a544 100644
--- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml
+++ b/src/virtualkeyboard/content/components/MultitapInputMethod.qml
@@ -34,8 +34,8 @@ InputMethod {
     property string multitapSequence
     property int multitapIndex: -1
 
-    onMultitapSequenceChanged: selectionListChanged(SelectionListModel.WordCandidateList)
-    onMultitapIndexChanged: selectionListActiveItemChanged(SelectionListModel.WordCandidateList, multitapIndex)
+    onMultitapSequenceChanged: selectionListChanged(SelectionListModel.Type.WordCandidateList)
+    onMultitapIndexChanged: selectionListActiveItemChanged(SelectionListModel.Type.WordCandidateList, multitapIndex)
 
     property variant multiTapTimer: Timer {
         interval: 1200
@@ -45,7 +45,7 @@ InputMethod {
     }
 
     function inputModes(locale) {
-        return [InputEngine.Latin, InputEngine.Numeric, InputEngine.Dialable];
+        return [InputEngine.InputMode.Latin, InputEngine.InputMode.Numeric, InputEngine.InputMode.Dialable];
     }
 
     function setInputMode(locale, inputMode) {
@@ -105,7 +105,7 @@ InputMethod {
     }
 
     function selectionLists() {
-        return [SelectionListModel.WordCandidateList];
+        return [SelectionListModel.Type.WordCandidateList];
     }
 
     function selectionListItemCount(type) {
@@ -115,7 +115,7 @@ InputMethod {
     function selectionListData(type, index, role) {
         var result = null
         switch (role) {
-        case SelectionListModel.DisplayRole:
+        case SelectionListModel.Role.Display:
             result = multitapSequence.charAt(index)
             break
         default:
diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml
index 72448730..2cfcd5dd 100644
--- a/src/virtualkeyboard/content/components/TraceInputArea.qml
+++ b/src/virtualkeyboard/content/components/TraceInputArea.qml
@@ -52,9 +52,9 @@ MultiPointTouchArea {
 
     /*! Pattern recognition mode of this input area.
 
-        The default value is \l {InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}.
+        The default value is \l {InputEngine::PatternRecognitionMode::None} {InputEngine.PatternRecognitionMode.None}.
     */
-    property int patternRecognitionMode: InputEngine.PatternRecognitionDisabled
+    property int patternRecognitionMode: InputEngine.PatternRecognitionMode.None
 
     /*! List of horizontal rulers in the input area.
 
@@ -127,7 +127,7 @@ MultiPointTouchArea {
              canvasType: traceInputArea.canvasType
          })
 
-    enabled: patternRecognitionMode !== InputEngine.PatternRecognitionDisabled && InputContext.inputEngine.patternRecognitionModes.indexOf(patternRecognitionMode) !== -1
+    enabled: patternRecognitionMode !== InputEngine.PatternRecognitionMode.None && InputContext.inputEngine.patternRecognitionModes.indexOf(patternRecognitionMode) !== -1
 
     onPressed: {
         if (!keyboard.style.traceCanvasDelegate)
diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml
index fbc0dfe8..f380eb9e 100644
--- a/src/virtualkeyboard/content/components/TraceInputKey.qml
+++ b/src/virtualkeyboard/content/components/TraceInputKey.qml
@@ -57,7 +57,7 @@ Item {
 
     /*! Pattern recognition mode of this input area.
 
-        The default value is \l {InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}.
+        The default value is \l {InputEngine::PatternRecognitionMode::None} {InputEngine.PatternRecognitionMode.None}.
     */
     property alias patternRecognitionMode: traceInputArea.patternRecognitionMode
 
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
index e6c663b0..4e8fd690 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardColumn {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml b/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml
index f84d47dc..f614b76f 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml
@@ -36,8 +36,8 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Arabic
-    readonly property bool alphabeticInputMode: [InputEngine.Latin, InputEngine.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1
+    inputMode: InputEngine.InputMode.Arabic
+    readonly property bool alphabeticInputMode: [InputEngine.InputMode.Latin, InputEngine.InputMode.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -46,7 +46,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
                         alphabeticInputMode ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
@@ -73,19 +73,19 @@ KeyboardLayout {
         InputModeKey {
             weight: 217
             inputModeNameList: [
-                "ABC",  // InputEngine.Latin
-                "\u0660\u0661\u0662",  // InputEngine.Numeric
-                "123",  // InputEngine.Dialable
-                "",  // InputEngine.Pinyin
-                "",  // InputEngine.Cangjie
-                "",  // InputEngine.Zhuyin
-                "",  // InputEngine.Hangul
-                "",  // InputEngine.Hiragana
-                "",  // InputEngine.Katakana
-                "",  // InputEngine.FullwidthLatin
-                "",  // InputEngine.Greek
-                "",  // InputEngine.Cyrillic
-                "\u0623\u200C\u0628\u200C\u062C",  // InputEngine.Arabic
+                "ABC",  // InputEngine.InputMode.Latin
+                "\u0660\u0661\u0662",  // InputEngine.InputMode.Numeric
+                "123",  // InputEngine.InputMode.Dialable
+                "",  // InputEngine.InputMode.Pinyin
+                "",  // InputEngine.InputMode.Cangjie
+                "",  // InputEngine.InputMode.Zhuyin
+                "",  // InputEngine.InputMode.Hangul
+                "",  // InputEngine.InputMode.Hiragana
+                "",  // InputEngine.InputMode.Katakana
+                "",  // InputEngine.InputMode.FullwidthLatin
+                "",  // InputEngine.InputMode.Greek
+                "",  // InputEngine.InputMode.Cyrillic
+                "\u0623\u200C\u0628\u200C\u062C",  // InputEngine.InputMode.Arabic
             ]
         }
         ChangeLanguageKey {
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
index e79847ec..6c2b78c4 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
-    inputMode: InputEngine.Arabic
+    inputMode: InputEngine.InputMode.Arabic
     sourceComponent: InputContext.shift ? page2 : page1
     Component {
         id: page1
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
index 62f019d2..b3f5fc72 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardRow {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml b/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml
index 782f3217..60e8fe4c 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml
@@ -44,9 +44,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.Cyrillic ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.Cyrillic ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
                 }
             }
diff --git a/src/virtualkeyboard/content/layouts/bg_BG/main.qml b/src/virtualkeyboard/content/layouts/bg_BG/main.qml
index f9dad187..2e958aa8 100644
--- a/src/virtualkeyboard/content/layouts/bg_BG/main.qml
+++ b/src/virtualkeyboard/content/layouts/bg_BG/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? cyrillicLayout : latinLayout
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout
     Component {
         id: cyrillicLayout
         KeyboardLayout {
@@ -117,7 +117,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     text: "з"
@@ -293,7 +293,7 @@ KeyboardLayoutLoader {
                 keyWeight: 156
                 InputModeKey {
                     enabled: !(InputContext.inputMethodHints & Qt.ImhLatinOnly) && inputModeCount > 1
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: Qt.Key_Z
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml b/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml
index a8d3b59b..6ec47501 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml
@@ -36,7 +36,7 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -45,7 +45,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml b/src/virtualkeyboard/content/layouts/cs_CZ/main.qml
index 1a4057e8..4d328bff 100644
--- a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml
+++ b/src/virtualkeyboard/content/layouts/cs_CZ/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/virtualkeyboard/content/layouts/da_DK/main.qml
index d4284387..b03860e6 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/main.qml
+++ b/src/virtualkeyboard/content/layouts/da_DK/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/virtualkeyboard/content/layouts/de_DE/main.qml
index 578fb808..bd91ec50 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/main.qml
+++ b/src/virtualkeyboard/content/layouts/de_DE/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml b/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml
index 03747a85..742e2874 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml
@@ -44,9 +44,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.Greek ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.Greek ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
                 }
             }
diff --git a/src/virtualkeyboard/content/layouts/el_GR/main.qml b/src/virtualkeyboard/content/layouts/el_GR/main.qml
index 50b5fec1..d9fbaf9e 100644
--- a/src/virtualkeyboard/content/layouts/el_GR/main.qml
+++ b/src/virtualkeyboard/content/layouts/el_GR/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Greek ? greekLayout : latinLayout
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Greek ? greekLayout : latinLayout
     Component {
         id: greekLayout
         KeyboardLayout {
@@ -114,7 +114,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Greek, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Greek, InputEngine.InputMode.Latin]
                 }
                 Key {
                     text: "ζ"
@@ -287,7 +287,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Greek, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Greek, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: Qt.Key_Z
diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
index 0b929162..aa0e7399 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
@@ -36,7 +36,7 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -45,7 +45,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/virtualkeyboard/content/layouts/es_ES/main.qml
index 528d1f18..b98980bb 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/main.qml
+++ b/src/virtualkeyboard/content/layouts/es_ES/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml b/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml
index 0b929162..aa0e7399 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml
@@ -36,7 +36,7 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -45,7 +45,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/es_MX/main.qml b/src/virtualkeyboard/content/layouts/es_MX/main.qml
index 528d1f18..b98980bb 100644
--- a/src/virtualkeyboard/content/layouts/es_MX/main.qml
+++ b/src/virtualkeyboard/content/layouts/es_MX/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/et_EE/main.qml b/src/virtualkeyboard/content/layouts/et_EE/main.qml
index 0deff352..4d62e93e 100644
--- a/src/virtualkeyboard/content/layouts/et_EE/main.qml
+++ b/src/virtualkeyboard/content/layouts/et_EE/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
index d001c2db..73fc6035 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardColumn {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml b/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml
index 006df195..bf89784c 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml
@@ -36,8 +36,8 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Arabic
-    readonly property bool alphabeticInputMode: [InputEngine.Latin, InputEngine.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1
+    inputMode: InputEngine.InputMode.Arabic
+    readonly property bool alphabeticInputMode: [InputEngine.InputMode.Latin, InputEngine.InputMode.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -46,7 +46,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
                         alphabeticInputMode ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
@@ -73,19 +73,19 @@ KeyboardLayout {
         InputModeKey {
             weight: 217
             inputModeNameList: [
-                "ABC",  // InputEngine.Latin
-                "\u0660\u0661\u0662",  // InputEngine.Numeric
-                "123",  // InputEngine.Dialable
-                "",  // InputEngine.Pinyin
-                "",  // InputEngine.Cangjie
-                "",  // InputEngine.Zhuyin
-                "",  // InputEngine.Hangul
-                "",  // InputEngine.Hiragana
-                "",  // InputEngine.Katakana
-                "",  // InputEngine.FullwidthLatin
-                "",  // InputEngine.Greek
-                "",  // InputEngine.Cyrillic
-                "\u0627\u200C\u0628\u200C\u067E",  // InputEngine.Arabic
+                "ABC",  // InputEngine.InputMode.Latin
+                "\u0660\u0661\u0662",  // InputEngine.InputMode.Numeric
+                "123",  // InputEngine.InputMode.Dialable
+                "",  // InputEngine.InputMode.Pinyin
+                "",  // InputEngine.InputMode.Cangjie
+                "",  // InputEngine.InputMode.Zhuyin
+                "",  // InputEngine.InputMode.Hangul
+                "",  // InputEngine.InputMode.Hiragana
+                "",  // InputEngine.InputMode.Katakana
+                "",  // InputEngine.InputMode.FullwidthLatin
+                "",  // InputEngine.InputMode.Greek
+                "",  // InputEngine.InputMode.Cyrillic
+                "\u0627\u200C\u0628\u200C\u067E",  // InputEngine.InputMode.Arabic
             ]
         }
         ChangeLanguageKey {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
index e73665a8..fb5280f3 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
-    inputMode: InputEngine.Arabic
+    inputMode: InputEngine.InputMode.Arabic
     sourceComponent: InputContext.shift ? page2 : page1
     Component {
         id: page1
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
index 79228726..6292d92f 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardRow {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/fallback/dialpad.qml b/src/virtualkeyboard/content/layouts/fallback/dialpad.qml
index 95a40db9..37e8c6a8 100644
--- a/src/virtualkeyboard/content/layouts/fallback/dialpad.qml
+++ b/src/virtualkeyboard/content/layouts/fallback/dialpad.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardColumn {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/fallback/digits.qml b/src/virtualkeyboard/content/layouts/fallback/digits.qml
index 5a59d3f3..4cbae92d 100644
--- a/src/virtualkeyboard/content/layouts/fallback/digits.qml
+++ b/src/virtualkeyboard/content/layouts/fallback/digits.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardColumn {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/fallback/handwriting.qml b/src/virtualkeyboard/content/layouts/fallback/handwriting.qml
index d4e9640a..126cde2d 100644
--- a/src/virtualkeyboard/content/layouts/fallback/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/fallback/handwriting.qml
@@ -44,7 +44,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/fallback/main.qml b/src/virtualkeyboard/content/layouts/fallback/main.qml
index 0c6370ae..c9a736f2 100644
--- a/src/virtualkeyboard/content/layouts/fallback/main.qml
+++ b/src/virtualkeyboard/content/layouts/fallback/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/fallback/numbers.qml b/src/virtualkeyboard/content/layouts/fallback/numbers.qml
index 88491ac5..461af67a 100644
--- a/src/virtualkeyboard/content/layouts/fallback/numbers.qml
+++ b/src/virtualkeyboard/content/layouts/fallback/numbers.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
-    inputMode: InputEngine.Numeric
+    inputMode: InputEngine.InputMode.Numeric
 
     KeyboardRow {
         Layout.fillWidth: false
diff --git a/src/virtualkeyboard/content/layouts/fallback/symbols.qml b/src/virtualkeyboard/content/layouts/fallback/symbols.qml
index 9c8d53f9..26d62951 100644
--- a/src/virtualkeyboard/content/layouts/fallback/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/fallback/symbols.qml
@@ -180,7 +180,7 @@ KeyboardLayoutLoader {
                 keyWeight: 154
                 SymbolModeKey {
                     weight: 217
-                    displayText: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? "АБВ" : "ABC"
+                    displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? "АБВ" : "ABC"
                 }
                 ChangeLanguageKey {
                     weight: 154
@@ -350,7 +350,7 @@ KeyboardLayoutLoader {
                 keyWeight: 154
                 SymbolModeKey {
                     weight: 217
-                    displayText: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? "АБВ" : "ABC"
+                    displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? "АБВ" : "ABC"
                 }
                 ChangeLanguageKey {
                     weight: 154
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/virtualkeyboard/content/layouts/fi_FI/main.qml
index b90a43cf..a3a8a86f 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml
+++ b/src/virtualkeyboard/content/layouts/fi_FI/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/fr_CA/main.qml b/src/virtualkeyboard/content/layouts/fr_CA/main.qml
index d71442bf..8866dfd7 100644
--- a/src/virtualkeyboard/content/layouts/fr_CA/main.qml
+++ b/src/virtualkeyboard/content/layouts/fr_CA/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/virtualkeyboard/content/layouts/fr_FR/main.qml
index 375b589f..753d8e67 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml
+++ b/src/virtualkeyboard/content/layouts/fr_FR/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml b/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml
index 321fbd42..e369de68 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml
@@ -44,9 +44,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.Hebrew ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.Hebrew ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
                 }
             }
diff --git a/src/virtualkeyboard/content/layouts/he_IL/main.qml b/src/virtualkeyboard/content/layouts/he_IL/main.qml
index fde3cb4b..4c47fc56 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/main.qml
+++ b/src/virtualkeyboard/content/layouts/he_IL/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Hebrew ? hebrewLayout : latinLayout
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Hebrew ? hebrewLayout : latinLayout
     Component {
         id: hebrewLayout
         KeyboardLayout {
@@ -122,7 +122,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Hebrew, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Hebrew, InputEngine.InputMode.Latin]
                 }
                 Key {
                     text: "\u05D6"
@@ -302,7 +302,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Hebrew, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Hebrew, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: Qt.Key_Z
diff --git a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml b/src/virtualkeyboard/content/layouts/he_IL/symbols.qml
index 866a91a7..f4e58652 100644
--- a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/he_IL/symbols.qml
@@ -180,7 +180,7 @@ KeyboardLayoutLoader {
                 keyWeight: 154
                 SymbolModeKey {
                     weight: 217
-                    displayText: InputContext.inputEngine.inputMode === InputEngine.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC"
+                    displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC"
                 }
                 ChangeLanguageKey {
                     weight: 154
@@ -350,7 +350,7 @@ KeyboardLayoutLoader {
                 keyWeight: 154
                 SymbolModeKey {
                     weight: 217
-                    displayText: InputContext.inputEngine.inputMode === InputEngine.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC"
+                    displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC"
                 }
                 ChangeLanguageKey {
                     weight: 154
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml b/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml
index a8147bd4..2eb4cc21 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml
@@ -44,7 +44,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
@@ -70,8 +70,8 @@ KeyboardLayout {
             key: Qt.Key_Mode_switch
             noKeyEvent: true
             functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
+            text: InputContext.inputEngine.inputMode === InputEngine.InputMode.Latin ? "123" : "ABC"
+            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.InputMode.Latin ? InputEngine.InputMode.Numeric : InputEngine.InputMode.Latin
             enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
             keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml
index 974ba2ab..b4b1819e 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml
+++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayoutLoader {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     sourceComponent: InputContext.shift ? page2 : page1
     Component {
         id: page1
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml b/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml
index 6f43e6de..d601568c 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml
@@ -36,7 +36,7 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -45,7 +45,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/hr_HR/main.qml b/src/virtualkeyboard/content/layouts/hr_HR/main.qml
index 6c4c306c..4b4c46d9 100644
--- a/src/virtualkeyboard/content/layouts/hr_HR/main.qml
+++ b/src/virtualkeyboard/content/layouts/hr_HR/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml b/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml
index a8d3b59b..6ec47501 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml
@@ -36,7 +36,7 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -45,7 +45,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/hu_HU/main.qml b/src/virtualkeyboard/content/layouts/hu_HU/main.qml
index 21a513a3..0834dc04 100644
--- a/src/virtualkeyboard/content/layouts/hu_HU/main.qml
+++ b/src/virtualkeyboard/content/layouts/hu_HU/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/virtualkeyboard/content/layouts/it_IT/main.qml
index c051e08f..72d7c03c 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/main.qml
+++ b/src/virtualkeyboard/content/layouts/it_IT/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml b/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml
index 9fe3b191..98bdb667 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml
@@ -43,9 +43,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.JapaneseHandwriting ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.JapaneseHandwriting ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
 
                 }
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml
index 2d765d36..dca39066 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml
+++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml
@@ -35,7 +35,7 @@ KeyboardLayoutLoader {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; JapaneseInputMethod {}', parent, "japaneseInputMethod")
     }
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.FullwidthLatin ? page2 : page1
     Component {
         id: page1
         KeyboardLayout {
@@ -132,16 +132,16 @@ KeyboardLayoutLoader {
                 InputModeKey {
                     enabled: !(InputContext.inputMethodHints & Qt.ImhLatinOnly) && inputModeCount > 1
                     inputModeNameList: [
-                        "半角",  // InputEngine.Latin
-                        "",     // InputEngine.Numeric
-                        "",     // InputEngine.Dialable
-                        "",     // InputEngine.Pinyin
-                        "",     // InputEngine.Cangjie
-                        "",     // InputEngine.Zhuyin
-                        "",     // InputEngine.Hangul
-                        "あ",    // InputEngine.Hiragana
-                        "カ",    // InputEngine.Katakana
-                        "全角",  // InputEngine.FullwidthLatin
+                        "半角",  // InputEngine.InputMode.Latin
+                        "",     // InputEngine.InputMode.Numeric
+                        "",     // InputEngine.InputMode.Dialable
+                        "",     // InputEngine.InputMode.Pinyin
+                        "",     // InputEngine.InputMode.Cangjie
+                        "",     // InputEngine.InputMode.Zhuyin
+                        "",     // InputEngine.InputMode.Hangul
+                        "あ",    // InputEngine.InputMode.Hiragana
+                        "カ",    // InputEngine.InputMode.Katakana
+                        "全角",  // InputEngine.InputMode.FullwidthLatin
                     ]
                 }
                 Key {
@@ -211,7 +211,7 @@ KeyboardLayoutLoader {
                 }
                 SpaceKey {
                     weight: 556
-                    text: InputContext.inputEngine.inputMode != InputEngine.Latin ? "\u3000" : " "
+                    text: InputContext.inputEngine.inputMode != InputEngine.InputMode.Latin ? "\u3000" : " "
                 }
                 Key {
                     key: Qt.Key_Slash
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml b/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml
index 58fb566b..b3027e2c 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml
@@ -50,7 +50,7 @@ KeyboardLayout {
     function preferredInputMode() {
         return InputContext.inputMethodHints &
                 (Qt.ImhPreferLatin | Qt.ImhEmailCharactersOnly | Qt.ImhUrlCharactersOnly |
-                 Qt.ImhLatinOnly) ? InputEngine.Latin : InputEngine.KoreanHandwriting
+                 Qt.ImhLatinOnly) ? InputEngine.InputMode.Latin : InputEngine.InputMode.KoreanHandwriting
     }
 
     KeyboardRow {
@@ -60,9 +60,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.KoreanHandwriting ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.KoreanHandwriting ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
 
                 }
@@ -78,7 +78,7 @@ KeyboardLayout {
             }
             KeyboardRow {
                 ShiftKey {
-                    enabled: InputContext.inputEngine.inputMode !== InputEngine.KoreanHandwriting
+                    enabled: InputContext.inputEngine.inputMode !== InputEngine.InputMode.KoreanHandwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml
index 647f88e0..8580045b 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml
+++ b/src/virtualkeyboard/content/layouts/nb_NO/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/virtualkeyboard/content/layouts/pl_PL/main.qml
index 72a7b89d..2a7ebfd0 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml
+++ b/src/virtualkeyboard/content/layouts/pl_PL/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/pt_BR/main.qml b/src/virtualkeyboard/content/layouts/pt_BR/main.qml
index 21cbf640..53ed462f 100644
--- a/src/virtualkeyboard/content/layouts/pt_BR/main.qml
+++ b/src/virtualkeyboard/content/layouts/pt_BR/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/virtualkeyboard/content/layouts/pt_PT/main.qml
index 21cbf640..53ed462f 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml
+++ b/src/virtualkeyboard/content/layouts/pt_PT/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
index 7826b542..c28ac34d 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
@@ -36,7 +36,7 @@ KeyboardLayout {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 
     KeyboardRow {
         Layout.preferredHeight: 3
@@ -45,7 +45,7 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                 }
             }
         }
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/main.qml b/src/virtualkeyboard/content/layouts/ro_RO/main.qml
index 3524e572..ea3865eb 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/main.qml
+++ b/src/virtualkeyboard/content/layouts/ro_RO/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/virtualkeyboard/content/layouts/ru_RU/main.qml
index f69e5bad..87eb2382 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml
+++ b/src/virtualkeyboard/content/layouts/ru_RU/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? cyrillicLayout : latinLayout
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout
     Component {
         id: cyrillicLayout
         KeyboardLayout {
@@ -141,7 +141,7 @@ KeyboardLayoutLoader {
             }
             KeyboardRow {
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: 0x042F
@@ -318,7 +318,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: Qt.Key_Y
diff --git a/src/virtualkeyboard/content/layouts/sk_SK/main.qml b/src/virtualkeyboard/content/layouts/sk_SK/main.qml
index 53a908a2..1f739d31 100644
--- a/src/virtualkeyboard/content/layouts/sk_SK/main.qml
+++ b/src/virtualkeyboard/content/layouts/sk_SK/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/sl_SI/main.qml b/src/virtualkeyboard/content/layouts/sl_SI/main.qml
index c6abf6d1..76293626 100644
--- a/src/virtualkeyboard/content/layouts/sl_SI/main.qml
+++ b/src/virtualkeyboard/content/layouts/sl_SI/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/sq_AL/main.qml b/src/virtualkeyboard/content/layouts/sq_AL/main.qml
index b1474285..4b50e883 100644
--- a/src/virtualkeyboard/content/layouts/sq_AL/main.qml
+++ b/src/virtualkeyboard/content/layouts/sq_AL/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml b/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml
index 7781e455..f5f2d44c 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml
@@ -44,9 +44,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.Cyrillic ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.Cyrillic ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
                 }
             }
diff --git a/src/virtualkeyboard/content/layouts/sr_SP/main.qml b/src/virtualkeyboard/content/layouts/sr_SP/main.qml
index d739e79c..acd381ae 100644
--- a/src/virtualkeyboard/content/layouts/sr_SP/main.qml
+++ b/src/virtualkeyboard/content/layouts/sr_SP/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? cyrillicLayout : latinLayout
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout
     Component {
         id: cyrillicLayout
         KeyboardLayout {
@@ -117,7 +117,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     text: "ѕ"
@@ -287,7 +287,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: Qt.Key_Y
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/virtualkeyboard/content/layouts/sv_SE/main.qml
index b90a43cf..a3a8a86f 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml
+++ b/src/virtualkeyboard/content/layouts/sv_SE/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/th_TH/main.qml b/src/virtualkeyboard/content/layouts/th_TH/main.qml
index baf18781..a44de2a4 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/main.qml
+++ b/src/virtualkeyboard/content/layouts/th_TH/main.qml
@@ -32,7 +32,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     function createInputMethod() {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; ThaiInputMethod {}', parent, "thaiInputMethod")
     }
diff --git a/src/virtualkeyboard/content/layouts/tr_TR/main.qml b/src/virtualkeyboard/content/layouts/tr_TR/main.qml
index 2fec7d57..31bf0dc1 100644
--- a/src/virtualkeyboard/content/layouts/tr_TR/main.qml
+++ b/src/virtualkeyboard/content/layouts/tr_TR/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     keyWeight: 160
     KeyboardRow {
         Key {
diff --git a/src/virtualkeyboard/content/layouts/uk_UA/main.qml b/src/virtualkeyboard/content/layouts/uk_UA/main.qml
index 011fc309..dfe36b2e 100644
--- a/src/virtualkeyboard/content/layouts/uk_UA/main.qml
+++ b/src/virtualkeyboard/content/layouts/uk_UA/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? cyrillicLayout : latinLayout
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout
     Component {
         id: cyrillicLayout
         KeyboardLayout {
@@ -121,7 +121,7 @@ KeyboardLayoutLoader {
             }
             KeyboardRow {
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     text: "ґ"
@@ -292,7 +292,7 @@ KeyboardLayoutLoader {
             KeyboardRow {
                 keyWeight: 156
                 InputModeKey {
-                    inputModes: [InputEngine.Cyrillic, InputEngine.Latin]
+                    inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin]
                 }
                 Key {
                     key: Qt.Key_Z
diff --git a/src/virtualkeyboard/content/layouts/vi_VN/main.qml b/src/virtualkeyboard/content/layouts/vi_VN/main.qml
index 13f3cf95..fabc6c46 100644
--- a/src/virtualkeyboard/content/layouts/vi_VN/main.qml
+++ b/src/virtualkeyboard/content/layouts/vi_VN/main.qml
@@ -31,7 +31,7 @@ import QtQuick 2.10
 import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
     sharedLayouts: ["numbers", "digits"]
     keyWeight: 160
     KeyboardRow {
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml b/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml
index 598980d1..61ed186a 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml
@@ -50,7 +50,7 @@ KeyboardLayout {
     function preferredInputMode() {
         return InputContext.inputMethodHints &
                 (Qt.ImhPreferLatin | Qt.ImhEmailCharactersOnly | Qt.ImhUrlCharactersOnly |
-                 Qt.ImhLatinOnly) ? InputEngine.Latin : InputEngine.ChineseHandwriting
+                 Qt.ImhLatinOnly) ? InputEngine.InputMode.Latin : InputEngine.InputMode.ChineseHandwriting
     }
 
     KeyboardRow {
@@ -60,9 +60,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.ChineseHandwriting ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.ChineseHandwriting ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
 
                 }
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml b/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml
index 598980d1..61ed186a 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml
@@ -50,7 +50,7 @@ KeyboardLayout {
     function preferredInputMode() {
         return InputContext.inputMethodHints &
                 (Qt.ImhPreferLatin | Qt.ImhEmailCharactersOnly | Qt.ImhUrlCharactersOnly |
-                 Qt.ImhLatinOnly) ? InputEngine.Latin : InputEngine.ChineseHandwriting
+                 Qt.ImhLatinOnly) ? InputEngine.InputMode.Latin : InputEngine.InputMode.ChineseHandwriting
     }
 
     KeyboardRow {
@@ -60,9 +60,9 @@ KeyboardLayout {
             KeyboardRow {
                 TraceInputKey {
                     objectName: "hwrInputArea"
-                    patternRecognitionMode: InputEngine.HandwritingRecoginition
+                    patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting
                     horizontalRulers:
-                        InputContext.inputEngine.inputMode !== InputEngine.ChineseHandwriting ? [] :
+                        InputContext.inputEngine.inputMode !== InputEngine.InputMode.ChineseHandwriting ? [] :
                             [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3]
 
                 }
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
index 7c5728c7..32a8c393 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml
+++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
@@ -36,7 +36,7 @@ KeyboardLayoutLoader {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; TCInputMethod {}', parent, "tcInputMethod")
     }
     sharedLayouts: ['symbols']
-    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cangjie ? pageCangjie : pageZhuyin
+    sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cangjie ? pageCangjie : pageZhuyin
     Component {
         id: pageCangjie
         KeyboardLayout {
@@ -201,7 +201,7 @@ KeyboardLayoutLoader {
                     weight: 154
                 }
                 InputModeKey {
-                    visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.Zhuyin) !== -1
+                    visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.InputMode.Zhuyin) !== -1
                 }
                 SpaceKey {
                     weight: 864
@@ -429,7 +429,7 @@ KeyboardLayoutLoader {
                     weight: 154
                 }
                 InputModeKey {
-                    visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.Cangjie) !== -1
+                    visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.InputMode.Cangjie) !== -1
                 }
                 SpaceKey {
                     weight: 864
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index d4b6c119..d8261b96 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard.Styles 2.1
 
 KeyboardStyle {
     id: currentStyle
-    readonly property bool compactSelectionList: [InputEngine.Pinyin, InputEngine.Cangjie, InputEngine.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1
+    readonly property bool compactSelectionList: [InputEngine.InputMode.Pinyin, InputEngine.InputMode.Cangjie, InputEngine.InputMode.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1
     readonly property string fontFamily: "Sans"
     readonly property real keyBackgroundMargin: Math.round(13 * scaleHint)
     readonly property real keyContentMargin: Math.round(45 * scaleHint)
@@ -767,30 +767,30 @@ KeyboardStyle {
             anchors.margins: keyBackgroundMargin
             Text {
                 id: hwrInputModeIndicator
-                visible: control.patternRecognitionMode === InputEngine.HandwritingRecoginition
+                visible: control.patternRecognitionMode === InputEngine.PatternRecognitionMode.Handwriting
                 text: {
                     switch (InputContext.inputEngine.inputMode) {
-                    case InputEngine.Numeric:
+                    case InputEngine.InputMode.Numeric:
                         if (["ar", "fa"].indexOf(InputContext.locale.substring(0, 2)) !== -1)
                             return "\u0660\u0661\u0662"
                         // Fallthrough
-                    case InputEngine.Dialable:
+                    case InputEngine.InputMode.Dialable:
                         return "123"
-                    case InputEngine.Greek:
+                    case InputEngine.InputMode.Greek:
                         return "ΑΒΓ"
-                    case InputEngine.Cyrillic:
+                    case InputEngine.InputMode.Cyrillic:
                         return "АБВ"
-                    case InputEngine.Arabic:
+                    case InputEngine.InputMode.Arabic:
                         if (InputContext.locale.substring(0, 2) === "fa")
                             return "\u0627\u200C\u0628\u200C\u067E"
                         return "\u0623\u200C\u0628\u200C\u062C"
-                    case InputEngine.Hebrew:
+                    case InputEngine.InputMode.Hebrew:
                         return "\u05D0\u05D1\u05D2"
-                    case InputEngine.ChineseHandwriting:
+                    case InputEngine.InputMode.ChineseHandwriting:
                         return "中文"
-                    case InputEngine.JapaneseHandwriting:
+                    case InputEngine.InputMode.JapaneseHandwriting:
                         return "日本語"
-                    case InputEngine.KoreanHandwriting:
+                    case InputEngine.InputMode.KoreanHandwriting:
                         return "한국어"
                     default:
                         return "Abc"
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index 53d09399..88d5fb8b 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard.Styles 2.1
 
 KeyboardStyle {
     id: currentStyle
-    readonly property bool compactSelectionList: [InputEngine.Pinyin, InputEngine.Cangjie, InputEngine.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1
+    readonly property bool compactSelectionList: [InputEngine.InputMode.Pinyin, InputEngine.InputMode.Cangjie, InputEngine.InputMode.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1
     readonly property string fontFamily: "Courier"
     readonly property real keyBackgroundMargin: Math.round(9 * scaleHint)
     readonly property real keyContentMargin: Math.round(30 * scaleHint)
@@ -880,30 +880,30 @@ KeyboardStyle {
         }
         Text {
             id: hwrInputModeIndicator
-            visible: control.patternRecognitionMode === InputEngine.HandwritingRecoginition
+            visible: control.patternRecognitionMode === InputEngine.PatternRecognitionMode.Handwriting
             text: {
                 switch (InputContext.inputEngine.inputMode) {
-                case InputEngine.Numeric:
+                case InputEngine.InputMode.Numeric:
                     if (["ar", "fa"].indexOf(InputContext.locale.substring(0, 2)) !== -1)
                         return "\u0660\u0661\u0662"
                     // Fallthrough
-                case InputEngine.Dialable:
+                case InputEngine.InputMode.Dialable:
                     return "123"
-                case InputEngine.Greek:
+                case InputEngine.InputMode.Greek:
                     return "ΑΒΓ"
-                case InputEngine.Cyrillic:
+                case InputEngine.InputMode.Cyrillic:
                     return "АБВ"
-                case InputEngine.Arabic:
+                case InputEngine.InputMode.Arabic:
                     if (InputContext.locale.substring(0, 2) === "fa")
                         return "\u0627\u200C\u0628\u200C\u067E"
                     return "\u0623\u200C\u0628\u200C\u062C"
-                case InputEngine.Hebrew:
+                case InputEngine.InputMode.Hebrew:
                     return "\u05D0\u05D1\u05D2"
-                case InputEngine.ChineseHandwriting:
+                case InputEngine.InputMode.ChineseHandwriting:
                     return "中文"
-                case InputEngine.JapaneseHandwriting:
+                case InputEngine.InputMode.JapaneseHandwriting:
                     return "日本語"
-                case InputEngine.KoreanHandwriting:
+                case InputEngine.InputMode.KoreanHandwriting:
                     return "한국어"
                 default:
                     return "Abc"
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index 39b4e1bc..10e0beea 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -327,7 +327,7 @@ list types:
 
 \code
 function selectionLists() {
-    return [SelectionListModel.WordCandidateList];
+    return [SelectionListModel.Type.WordCandidateList];
 }
 \endcode
 
@@ -342,8 +342,8 @@ the input method requires the UI to highlight an item in the list, it will emit
 the InputMethod::selectionListActiveItemChanged signal.
 
 \code
-selectionListChanged(SelectionListModel.WordCandidateList)
-selectionListActiveItemChanged(SelectionListModel.WordCandidateList, wordIndex)
+selectionListChanged(SelectionListModel.Type.WordCandidateList)
+selectionListActiveItemChanged(SelectionListModel.Type.WordCandidateList, wordIndex)
 \endcode
 
 \section3 Populating Items in the Selection Lists
@@ -356,7 +356,7 @@ items in the list identified by the given type.
 
 \code
 function selectionListItemCount(type) {
-    if (type == SelectionListModel.WordCandidateList) {
+    if (type == SelectionListModel.Type.WordCandidateList) {
         return wordList.length
     }
     return 0
@@ -368,9 +368,9 @@ The InputMethod::selectionListData callback requests the data for items.
 \code
 function selectionListData(type, index, role) {
     var result = null
-    if (type == SelectionListModel.WordCandidateList) {
+    if (type == SelectionListModel.Type.WordCandidateList) {
         switch (role) {
-        case SelectionListModel.DisplayRole:
+        case SelectionListModel.Role.Display:
             result = wordList[index]
             break
         default:
@@ -382,7 +382,7 @@ function selectionListData(type, index, role) {
 \endcode
 
 The \a role parameter identifies which data is requested for an item. For
-example, the SelectionListModel.DisplayRole requests the display text data.
+example, the SelectionListModel.Role.Display requests the display text data.
 
 \section3 Responding to User Actions
 
@@ -391,7 +391,7 @@ event in the InputMethod::selectionListItemSelected method callback.
 
 \code
 function selectionListItemSelected(type, index) {
-    if (type == SelectionListModel.WordCandidateList) {
+    if (type == SelectionListModel.Type.WordCandidateList) {
         inputContext.commit(wordlist[index])
         update()
     }
@@ -452,7 +452,7 @@ from a variety of input sources (e.g. keyboard layout or full screen).
 
 The patternRecognitionModes method returns a list of pattern recognition modes,
 which are supported by the input method. A pattern recognition mode, such as
-\l { QVirtualKeyboardInputEngine::HandwritingRecoginition } { HandwritingRecoginition },
+\l { QVirtualKeyboardInputEngine::PatternRecognitionMode::Handwriting } { HandwritingRecognition },
 defines the method by which the input method processes the data.
 
 The trace interaction is started when an input source detects a new contact point, and
diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp
index 3ef0e3d8..45c0da97 100644
--- a/src/virtualkeyboard/inputmethod.cpp
+++ b/src/virtualkeyboard/inputmethod.cpp
@@ -319,14 +319,14 @@ int InputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type
     return result.toInt();
 }
 
-QVariant InputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant InputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     QVariant result;
     QMetaObject::invokeMethod(this, "selectionListData",
                               Q_RETURN_ARG(QVariant, result),
                               Q_ARG(QVariant, static_cast<int>(type)),
                               Q_ARG(QVariant, index),
-                              Q_ARG(QVariant, role));
+                              Q_ARG(QVariant, static_cast<int>(role)));
     if (result.isNull()) {
         result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role);
     }
diff --git a/src/virtualkeyboard/inputmethod_p.h b/src/virtualkeyboard/inputmethod_p.h
index f97e68cd..0489bcae 100644
--- a/src/virtualkeyboard/inputmethod_p.h
+++ b/src/virtualkeyboard/inputmethod_p.h
@@ -64,7 +64,7 @@ public:
 
     QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
 
     QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const;
diff --git a/src/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp
index a2732940..8ee7088c 100644
--- a/src/virtualkeyboard/plaininputmethod.cpp
+++ b/src/virtualkeyboard/plaininputmethod.cpp
@@ -53,22 +53,22 @@ QList<QVirtualKeyboardInputEngine::InputMode> PlainInputMethod::inputModes(const
     QList<QVirtualKeyboardInputEngine::InputMode> result;
     switch (QLocale(locale).script()) {
     case QLocale::GreekScript:
-        result.append(QVirtualKeyboardInputEngine::Greek);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Greek);
         break;
     case QLocale::CyrillicScript:
-        result.append(QVirtualKeyboardInputEngine::Cyrillic);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Cyrillic);
         break;
     case QLocale::ArabicScript:
-        result.append(QVirtualKeyboardInputEngine::Arabic);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Arabic);
         break;
     case QLocale::HebrewScript:
-        result.append(QVirtualKeyboardInputEngine::Hebrew);
+        result.append(QVirtualKeyboardInputEngine::InputMode::Hebrew);
         break;
     default:
         break;
     }
-    result.append(QVirtualKeyboardInputEngine::Latin);
-    result.append(QVirtualKeyboardInputEngine::Numeric);
+    result.append(QVirtualKeyboardInputEngine::InputMode::Latin);
+    result.append(QVirtualKeyboardInputEngine::InputMode::Numeric);
     return result;
 }
 
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp
index 1c23c618..bf70f829 100644
--- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp
@@ -145,14 +145,14 @@ int QVirtualKeyboardAbstractInputMethod::selectionListItemCount(QVirtualKeyboard
     return 0;
 }
 
-QVariant QVirtualKeyboardAbstractInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+QVariant QVirtualKeyboardAbstractInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 {
     Q_UNUSED(type)
     Q_UNUSED(index)
     switch (role) {
-    case QVirtualKeyboardSelectionListModel::DisplayRole:
+    case QVirtualKeyboardSelectionListModel::Role::Display:
         return QVariant("");
-    case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole:
+    case QVirtualKeyboardSelectionListModel::Role::WordCompletionLength:
         return QVariant(0);
     }
     return QVariant();
@@ -310,7 +310,7 @@ bool QVirtualKeyboardAbstractInputMethod::clickPreeditText(int cursorPosition)
 */
 
 /*!
-    \fn QVariant QVirtualKeyboardAbstractInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role)
+    \fn QVariant QVirtualKeyboardAbstractInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role)
 
     Returns item data for the selection list identified by \a type. The \a \l {QVirtualKeyboardSelectionListModel::Role}{role}
     parameter specifies which data is requested. The \a index parameter is a
@@ -333,7 +333,7 @@ bool QVirtualKeyboardAbstractInputMethod::clickPreeditText(int cursorPosition)
 */
 
 /*!
-    \fn void QVirtualKeyboardAbstractInputMethod::selectionListChanged(int type)
+    \fn void QVirtualKeyboardAbstractInputMethod::selectionListChanged(QVirtualKeyboardSelectionListModel::Type type)
 
     The input method emits this signal when the contents of the selection list
     has changed. The \a type parameter specifies which selection list has
@@ -341,7 +341,7 @@ bool QVirtualKeyboardAbstractInputMethod::clickPreeditText(int cursorPosition)
 */
 
 /*!
-    \fn void QVirtualKeyboardAbstractInputMethod::selectionListActiveItemChanged(int type, int index)
+    \fn void QVirtualKeyboardAbstractInputMethod::selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type type, int index)
 
     The input method emits this signal when the current \a index has changed
     in the selection list identified by \a type.
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
index ce574d89..b3fc0f04 100644
--- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
@@ -57,7 +57,7 @@ public:
 
     virtual QList<QVirtualKeyboardSelectionListModel::Type> selectionLists();
     virtual int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type);
-    virtual QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role);
+    virtual QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, QVirtualKeyboardSelectionListModel::Role role);
     virtual void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index);
     virtual bool selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index);
 
@@ -71,8 +71,8 @@ public:
     virtual bool clickPreeditText(int cursorPosition);
 
 Q_SIGNALS:
-    void selectionListChanged(int type);
-    void selectionListActiveItemChanged(int type, int index);
+    void selectionListChanged(QVirtualKeyboardSelectionListModel::Type type);
+    void selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type type, int index);
     void selectionListsChanged();
 
 public Q_SLOTS:
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 6afa47ba..9e55d121 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -239,7 +239,7 @@ void QVirtualKeyboardInputContextPrivate::forceCursorPosition(int anchorPosition
         if (!inputMethodHints.testFlag(Qt::ImhNoPredictiveText) &&
                    cursorPosition > 0 && selectedText.isEmpty()) {
             stateFlags |= QVirtualKeyboardInputContextPrivate::ReselectEventState;
-            if (inputEngine->reselect(cursorPosition, QVirtualKeyboardInputEngine::WordAtCursor))
+            if (inputEngine->reselect(cursorPosition, QVirtualKeyboardInputEngine::ReselectFlag::WordAtCursor))
                 stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodClickState;
             stateFlags &= ~QVirtualKeyboardInputContextPrivate::ReselectEventState;
         }
@@ -415,7 +415,7 @@ void QVirtualKeyboardInputContextPrivate::update(Qt::InputMethodQueries queries)
             !inputMethodHints.testFlag(Qt::ImhNoPredictiveText) &&
             cursorPosition > 0 && this->selectedText.isEmpty()) {
         stateFlags |= QVirtualKeyboardInputContextPrivate::ReselectEventState;
-        if (inputEngine->reselect(cursorPosition, QVirtualKeyboardInputEngine::WordAtCursor))
+        if (inputEngine->reselect(cursorPosition, QVirtualKeyboardInputEngine::ReselectFlag::WordAtCursor))
             stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodClickState;
         stateFlags &= ~QVirtualKeyboardInputContextPrivate::ReselectEventState;
     }
@@ -440,7 +440,7 @@ void QVirtualKeyboardInputContextPrivate::invokeAction(QInputMethod::Action acti
                 stateFlags |= QVirtualKeyboardInputContextPrivate::ReselectEventState;
                 _forceCursorPosition = this->cursorPosition + cursorPosition;
                 commit();
-                inputEngine->reselect(this->cursorPosition, QVirtualKeyboardInputEngine::WordBeforeCursor);
+                inputEngine->reselect(this->cursorPosition, QVirtualKeyboardInputEngine::ReselectFlag::WordBeforeCursor);
                 stateFlags &= ~QVirtualKeyboardInputContextPrivate::ReselectEventState;
             } else if (!preeditText.isEmpty() && cursorPosition == preeditText.length()) {
                 commit();
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
index 9b0032d4..0b1772dc 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
@@ -80,6 +80,7 @@ public:
         InputMethodClickState = 0x8,
         SyncShadowInputState = 0x10
     };
+    Q_FLAG(StateFlag)
     Q_DECLARE_FLAGS(StateFlags, StateFlag)
 
     ~QVirtualKeyboardInputContextPrivate();
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
index 4bee3904..82f2fe8f 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
@@ -51,8 +51,8 @@ public:
         q_ptr(q_ptr),
         inputContext(nullptr),
         fallbackInputMethod(nullptr),
-        textCase(QVirtualKeyboardInputEngine::Lower),
-        inputMode(QVirtualKeyboardInputEngine::Latin),
+        textCase(QVirtualKeyboardInputEngine::TextCase::Lower),
+        inputMode(QVirtualKeyboardInputEngine::InputMode::Latin),
         activeKey(Qt::Key_unknown),
         activeKeyModifiers(Qt::NoModifier),
         previousKey(Qt::Key_unknown),
@@ -170,7 +170,7 @@ void QVirtualKeyboardInputEngine::init()
     d->fallbackInputMethod = new FallbackInputMethod(this);
     if (d->fallbackInputMethod)
         d->fallbackInputMethod->setInputEngine(this);
-    d->selectionListModels[QVirtualKeyboardSelectionListModel::WordCandidateList] = new QVirtualKeyboardSelectionListModel(this);
+    d->selectionListModels[QVirtualKeyboardSelectionListModel::Type::WordCandidateList] = new QVirtualKeyboardSelectionListModel(this);
 }
 
 /*!
@@ -417,7 +417,7 @@ void QVirtualKeyboardInputEngine::setInputMode(QVirtualKeyboardInputEngine::Inpu
         updateInputModes();
         Q_ASSERT(cachedInputModes == d->inputModes);
 #endif
-        if (d->inputModes.contains(inputMode)) {
+        if (d->inputModes.contains(static_cast<const int>(inputMode))) {
             d->inputMethod->setInputMode(d->inputContext->locale(), inputMode);
             if (d->inputMode != inputMode) {
                 d->inputMode = inputMode;
@@ -433,13 +433,13 @@ void QVirtualKeyboardInputEngine::setInputMode(QVirtualKeyboardInputEngine::Inpu
 QVirtualKeyboardSelectionListModel *QVirtualKeyboardInputEngine::wordCandidateListModel() const
 {
     Q_D(const QVirtualKeyboardInputEngine);
-    return d->selectionListModels[QVirtualKeyboardSelectionListModel::WordCandidateList];
+    return d->selectionListModels[QVirtualKeyboardSelectionListModel::Type::WordCandidateList];
 }
 
 bool QVirtualKeyboardInputEngine::wordCandidateListVisibleHint() const
 {
     Q_D(const QVirtualKeyboardInputEngine);
-    const auto it = d->selectionListModels.constFind(QVirtualKeyboardSelectionListModel::WordCandidateList);
+    const auto it = d->selectionListModels.constFind(QVirtualKeyboardSelectionListModel::Type::WordCandidateList);
     if (it == d->selectionListModels.cend())
         return false;
     return it.value()->dataSource() != nullptr;
@@ -459,7 +459,7 @@ QList<int> QVirtualKeyboardInputEngine::patternRecognitionModes() const
         return resultList;
     resultList.reserve(patterRecognitionModeList.size());
     for (const PatternRecognitionMode &patternRecognitionMode : qAsConst(patterRecognitionModeList))
-        resultList.append(patternRecognitionMode);
+        resultList.append(static_cast<int>(patternRecognitionMode));
     return resultList;
 }
 
@@ -516,7 +516,7 @@ QVirtualKeyboardTrace *QVirtualKeyboardInputEngine::traceBegin(
                             << "traceScreenInfo:" << traceScreenInfo;
     if (!d->inputMethod)
         return nullptr;
-    if (patternRecognitionMode == PatternRecognitionDisabled)
+    if (patternRecognitionMode == PatternRecognitionMode::None)
         return nullptr;
     if (!d->inputMethod->patternRecognitionModes().contains(patternRecognitionMode))
         return nullptr;
@@ -625,7 +625,7 @@ void QVirtualKeyboardInputEngine::update()
 void QVirtualKeyboardInputEngine::shiftChanged()
 {
     Q_D(QVirtualKeyboardInputEngine);
-    TextCase newCase = d->inputContext->priv()->shiftHandler()->shift() ? Upper : Lower;
+    TextCase newCase = d->inputContext->priv()->shiftHandler()->shift() ? TextCase::Upper : TextCase::Lower;
     if (d->textCase != newCase) {
         d->textCase = newCase;
         if (d->inputMethod) {
@@ -648,11 +648,11 @@ void QVirtualKeyboardInputEngine::updateSelectionListModels()
             auto it = d->selectionListModels.find(selectionListType);
             if (it == d->selectionListModels.end()) {
                 it = d->selectionListModels.insert(selectionListType, new QVirtualKeyboardSelectionListModel(this));
-                if (selectionListType == QVirtualKeyboardSelectionListModel::WordCandidateList)
+                if (selectionListType == QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
                     emit wordCandidateListModelChanged();
             }
             it.value()->setDataSource(d->inputMethod, selectionListType);
-            if (selectionListType == QVirtualKeyboardSelectionListModel::WordCandidateList)
+            if (selectionListType == QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
                 emit wordCandidateListVisibleHintChanged();
             inactiveSelectionLists.removeAll(selectionListType);
         }
@@ -663,7 +663,7 @@ void QVirtualKeyboardInputEngine::updateSelectionListModels()
         const auto it = d->selectionListModels.constFind(selectionListType);
         if (it != d->selectionListModels.cend()) {
             it.value()->setDataSource(nullptr, selectionListType);
-            if (selectionListType == QVirtualKeyboardSelectionListModel::WordCandidateList)
+            if (selectionListType == QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
                 emit wordCandidateListVisibleHintChanged();
         }
     }
@@ -771,23 +771,23 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
     The predefined input modes are:
 
     \list
-        \li \c InputEngine.Latin The default input mode for latin text.
-        \li \c InputEngine.Numeric Only numeric input is allowed.
-        \li \c InputEngine.Dialable Only dialable input is allowed.
-        \li \c InputEngine.Pinyin Pinyin input mode for Chinese.
-        \li \c InputEngine.Cangjie Cangjie input mode for Chinese.
-        \li \c InputEngine.Zhuyin Zhuyin input mode for Chinese.
-        \li \c InputEngine.Hangul Hangul input mode for Korean.
-        \li \c InputEngine.Hiragana Hiragana input mode for Japanese.
-        \li \c InputEngine.Katakana Katakana input mode for Japanese.
-        \li \c InputEngine.FullwidthLatin Fullwidth latin input mode for East Asian languages.
-        \li \c InputEngine.Greek Greek input mode.
-        \li \c InputEngine.Cyrillic Cyrillic input mode.
-        \li \c InputEngine.Arabic Arabic input mode.
-        \li \c InputEngine.Hebrew Hebrew input mode.
-        \li \c InputEngine.ChineseHandwriting Chinese handwriting.
-        \li \c InputEngine.JapaneseHandwriting Japanese handwriting.
-        \li \c InputEngine.KoreanHandwriting Korean handwriting.
+        \li \c InputEngine.InputMode.Latin The default input mode for latin text.
+        \li \c InputEngine.InputMode.Numeric Only numeric input is allowed.
+        \li \c InputEngine.InputMode.Dialable Only dialable input is allowed.
+        \li \c InputEngine.InputMode.Pinyin Pinyin input mode for Chinese.
+        \li \c InputEngine.InputMode.Cangjie Cangjie input mode for Chinese.
+        \li \c InputEngine.InputMode.Zhuyin Zhuyin input mode for Chinese.
+        \li \c InputEngine.InputMode.Hangul Hangul input mode for Korean.
+        \li \c InputEngine.InputMode.Hiragana Hiragana input mode for Japanese.
+        \li \c InputEngine.InputMode.Katakana Katakana input mode for Japanese.
+        \li \c InputEngine.InputMode.FullwidthLatin Fullwidth latin input mode for East Asian languages.
+        \li \c InputEngine.InputMode.Greek Greek input mode.
+        \li \c InputEngine.InputMode.Cyrillic Cyrillic input mode.
+        \li \c InputEngine.InputMode.Arabic Arabic input mode.
+        \li \c InputEngine.InputMode.Hebrew Hebrew input mode.
+        \li \c InputEngine.InputMode.ChineseHandwriting Chinese handwriting.
+        \li \c InputEngine.InputMode.JapaneseHandwriting Japanese handwriting.
+        \li \c InputEngine.InputMode.KoreanHandwriting Korean handwriting.
     \endlist
 */
 
@@ -835,33 +835,33 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
 
     This enum specifies the input mode for the input method.
 
-    \value Latin
+    \value InputMode::Latin
            The default input mode for latin text.
-    \value Numeric
+    \value InputMode::Numeric
            Only numeric input is allowed.
-    \value Dialable
+    \value InputMode::Dialable
            Only dialable input is allowed.
-    \value Pinyin
+    \value InputMode::Pinyin
            Pinyin input mode for Chinese.
-    \value Cangjie
+    \value InputMode::Cangjie
            Cangjie input mode for Chinese.
-    \value Zhuyin
+    \value InputMode::Zhuyin
            Zhuyin input mode for Chinese.
-    \value Hangul
+    \value InputMode::Hangul
            Hangul input mode for Korean.
-    \value Hiragana
+    \value InputMode::Hiragana
            Hiragana input mode for Japanese.
-    \value Katakana
+    \value InputMode::Katakana
            Katakana input mode for Japanese.
-    \value FullwidthLatin
+    \value InputMode::FullwidthLatin
            Fullwidth latin input mode for East Asian languages.
-    \value Greek
+    \value InputMode::Greek
            Greek input mode.
-    \value Cyrillic
+    \value InputMode::Cyrillic
            Cyrillic input mode.
-    \value Arabic
+    \value InputMode::Arabic
            Arabic input mode.
-    \value Hebrew
+    \value InputMode::Hebrew
            Hebrew input mode.
 */
 
@@ -870,9 +870,9 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
 
     This enum specifies the text case for the input method.
 
-    \value Lower
+    \value TextCase::Lower
            Lower case text.
-    \value Upper
+    \value TextCase::Upper
            Upper case text.
 */
 
@@ -881,10 +881,14 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
 
     This enum specifies the input mode for the input method.
 
-    \value PatternRecognitionDisabled
+    \value PatternRecognitionMode::None
            Pattern recognition is not available.
-    \value HandwritingRecoginition
+    \value PatternRecognitionMode::PatternRecognitionDisabled
+           \c obsolete Use PatternRecognitionMode::None
+    \value PatternRecognitionMode::Handwriting
            Pattern recognition mode for handwriting recognition.
+    \value PatternRecognitionMode::HandwritingRecoginition
+           \c obsolete Use PatternRecognitionMode::Handwriting
 */
 
 /*!
@@ -892,11 +896,11 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
 
     This enum specifies the rules for word reselection.
 
-    \value WordBeforeCursor
+    \value ReselectFlag::WordBeforeCursor
            Activate the word before the cursor. When this flag is used exclusively, the word must end exactly at the cursor.
-    \value WordAfterCursor
+    \value ReselectFlag::WordAfterCursor
            Activate the word after the cursor. When this flag is used exclusively, the word must start exactly at the cursor.
-    \value WordAtCursor
+    \value ReselectFlag::WordAtCursor
            Activate the word at the cursor. This flag is a combination of the above flags with the exception that the word cannot start or stop at the cursor.
 */
 
@@ -1033,8 +1037,10 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
     The predefined pattern recognition modes are:
 
     \list
-        \li \c InputEngine.PatternRecognitionDisabled Pattern recognition is not available.
-        \li \c InputEngine.HandwritingRecoginition Pattern recognition mode for handwriting recognition.
+        \li \c InputEngine.PatternRecognitionMode.None Pattern recognition is not available.
+        \li \c InputEngine.PatternRecognitionMode.PatternRecognitionDisabled \c obsolete Use InputEngine.PatternRecognitionMode.None
+        \li \c InputEngine.PatternRecognitionMode.Handwriting Pattern recognition mode for handwriting recognition.
+        \li \c InputEngine.PatternRecognitionMode.HandwritingRecoginition \c obsolete Use InputEngine.PatternRecognitionMode.Handwriting
     \endlist
 */
 
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.h b/src/virtualkeyboard/qvirtualkeyboardinputengine.h
index 4201b59a..29c0eedd 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.h
@@ -47,7 +47,6 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputEngine : public QObject
     Q_OBJECT
     Q_DISABLE_COPY(QVirtualKeyboardInputEngine)
     Q_DECLARE_PRIVATE(QVirtualKeyboardInputEngine)
-    Q_FLAGS(ReselectFlags)
     Q_PROPERTY(Qt::Key activeKey READ activeKey NOTIFY activeKeyChanged)
     Q_PROPERTY(Qt::Key previousKey READ previousKey NOTIFY previousKeyChanged)
     Q_PROPERTY(QVirtualKeyboardAbstractInputMethod *inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged)
@@ -61,11 +60,13 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputEngine : public QObject
     void init();
 
 public:
-    enum TextCase {
+    enum class TextCase {
         Lower,
         Upper
     };
-    enum InputMode {
+    Q_ENUM(TextCase)
+
+    enum class InputMode {
         Latin,
         Numeric,
         Dialable,
@@ -84,20 +85,23 @@ public:
         JapaneseHandwriting,
         KoreanHandwriting
     };
-    enum PatternRecognitionMode {
-        PatternRecognitionDisabled,
-        HandwritingRecoginition
+    Q_ENUM(InputMode)
+
+    enum class PatternRecognitionMode {
+        None,
+        PatternRecognitionDisabled = None,
+        Handwriting,
+        HandwritingRecoginition = Handwriting
     };
-    enum ReselectFlag {
+    Q_ENUM(PatternRecognitionMode)
+
+    enum class ReselectFlag {
         WordBeforeCursor = 0x1,
         WordAfterCursor = 0x2,
         WordAtCursor = WordBeforeCursor | WordAfterCursor
     };
-
-    Q_ENUM(TextCase)
-    Q_ENUM(InputMode)
-    Q_ENUM(PatternRecognitionMode)
-    Q_DECLARE_FLAGS(ReselectFlags, ReselectFlag)
+    Q_FLAG(ReselectFlag)
+    Q_DECLARE_FLAGS(ReselectFlags, QVirtualKeyboardInputEngine::ReselectFlag)
 
 public:
     ~QVirtualKeyboardInputEngine();
@@ -159,10 +163,14 @@ private:
     friend class QVirtualKeyboardInputContextPrivate;
 };
 
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QVirtualKeyboardInputEngine::InputMode key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; }
+Q_DECLARE_OPERATORS_FOR_FLAGS(QVirtualKeyboardInputEngine::ReselectFlags)
+
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QVirtualKeyboardInputEngine::TextCase)
 Q_DECLARE_METATYPE(QVirtualKeyboardInputEngine::InputMode)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QVirtualKeyboardInputEngine::ReselectFlags)
+Q_DECLARE_METATYPE(QVirtualKeyboardInputEngine::PatternRecognitionMode)
+Q_DECLARE_METATYPE(QVirtualKeyboardInputEngine::ReselectFlag)
 
 #endif
diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
index 85ea90e1..99ea6ae0 100644
--- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
@@ -43,7 +43,7 @@ public:
     QVirtualKeyboardSelectionListModelPrivate() :
         QAbstractItemModelPrivate(),
         dataSource(nullptr),
-        type(QVirtualKeyboardSelectionListModel::WordCandidateList),
+        type(QVirtualKeyboardSelectionListModel::Type::WordCandidateList),
         rowCount(0),
         wclAutoCommitWord(false)
     {
@@ -67,14 +67,16 @@ public:
     provided by the input method.
 
     An instance of QVirtualKeyboardSelectionListModel cannot be created directly.
-    Instead, the InputEngine manages the instances and provides
-    access to the model by InputEngine::wordCandidateListModel
+    Instead, the QVirtualKeyboardInputEngine manages the instances and provides
+    access to the model by QVirtualKeyboardInputEngine::wordCandidateListModel
     property.
 
     The model exposes the following data roles for the list delegate:
     \list
-        \li \c display Display text for item
-        \li \c wordCompletionLength Word completion length for item
+        \li \c display Display text for item.
+        \li \c wordCompletionLength Word completion length for item.
+        \li \c dictionaryType Dictionary type of the word, see QVirtualKeyboardSelectionListModel::DictionaryType.
+        \li \c canRemoveSuggestion A boolean indicating if the word can be removed from the dictionary.
     \endlist
 
     The activeItemChanged signal indicates which item is currently
@@ -103,7 +105,7 @@ public:
 
     This enum specifies the type of selection list.
 
-    \value WordCandidateList
+    \value Type::WordCandidateList
            Shows list of word candidates
 */
 
@@ -112,18 +114,22 @@ public:
 
     This enum specifies a role of the data requested.
 
-    \value DisplayRole
+    \value Role::Display
            The data to be rendered in form of text.
-    \value WordCompletionLengthRole
+    \value Role::DisplayRole
+           \c obsolete Use Role::Display.
+    \value Role::WordCompletionLength
            An integer specifying the length of the word
            the completion part expressed as the
            number of characters counted from the
            end of the string.
-    \value DictionaryTypeRole
+    \value Role::WordCompletionLengthRole
+           \c obsolete Use Role::WordCompletionLength.
+    \value Role::Dictionary
            An integer specifying \ l {QVirtualKeyboardSelectionListModel::DictionaryType}{dictionary type}.
-    \value CanRemoveSuggestionRole
+    \value Role::CanRemoveSuggestion
            A boolean value indicating if the word candidate
-           can be removed from dictionary.
+           can be removed from the dictionary.
 */
 
 /*!
@@ -131,9 +137,9 @@ public:
 
     This enum specifies the dictionary type of a word.
 
-    \value DefaultDictionary
+    \value DictionaryType::Default
            The word candidate is from the default dictionary.
-    \value UserDictionary
+    \value DictionaryType::User
            The word candidate is from the user dictionary.
 */
 
@@ -141,8 +147,10 @@ QVirtualKeyboardSelectionListModel::QVirtualKeyboardSelectionListModel(QObject *
     QAbstractListModel(*new QVirtualKeyboardSelectionListModelPrivate(), parent)
 {
     Q_D(QVirtualKeyboardSelectionListModel);
-    d->roles[DisplayRole] = "display";
-    d->roles[WordCompletionLengthRole] = "wordCompletionLength";
+    d->roles[static_cast<const int>(Role::Display)] = "display";
+    d->roles[static_cast<const int>(Role::WordCompletionLength)] = "wordCompletionLength";
+    d->roles[static_cast<const int>(Role::Dictionary)] = "dictionary";
+    d->roles[static_cast<const int>(Role::CanRemoveSuggestion)] = "canRemoveSuggestion";
 }
 
 /*!
@@ -159,8 +167,8 @@ void QVirtualKeyboardSelectionListModel::setDataSource(QVirtualKeyboardAbstractI
 {
     Q_D(QVirtualKeyboardSelectionListModel);
     if (d->dataSource) {
-        disconnect(this, SLOT(selectionListChanged(int)));
-        disconnect(this, SLOT(selectionListActiveItemChanged(int, int)));
+        disconnect(this, SLOT(selectionListChanged(Type)));
+        disconnect(this, SLOT(selectionListActiveItemChanged(Type, int)));
     }
     d->type = type;
     if (d->dataSource) {
@@ -170,8 +178,8 @@ void QVirtualKeyboardSelectionListModel::setDataSource(QVirtualKeyboardAbstractI
     }
     d->dataSource = dataSource;
     if (d->dataSource) {
-        connect(d->dataSource, SIGNAL(selectionListChanged(int)), SLOT(selectionListChanged(int)));
-        connect(d->dataSource, SIGNAL(selectionListActiveItemChanged(int, int)), SLOT(selectionListActiveItemChanged(int, int)));
+        QObject::connect(d->dataSource, &QVirtualKeyboardAbstractInputMethod::selectionListChanged, this, &QVirtualKeyboardSelectionListModel::selectionListChanged);
+        QObject::connect(d->dataSource, &QVirtualKeyboardAbstractInputMethod::selectionListActiveItemChanged, this, &QVirtualKeyboardSelectionListModel::selectionListActiveItemChanged);
     }
 }
 
@@ -200,7 +208,7 @@ int QVirtualKeyboardSelectionListModel::rowCount(const QModelIndex &parent) cons
 QVariant QVirtualKeyboardSelectionListModel::data(const QModelIndex &index, int role) const
 {
     Q_D(const QVirtualKeyboardSelectionListModel);
-    return d->dataSource ? d->dataSource->selectionListData(d->type, index.row(), role) : QVariant();
+    return d->dataSource ? d->dataSource->selectionListData(d->type, index.row(), static_cast<Role>(role)) : QVariant();
 }
 
 /*!
@@ -254,15 +262,15 @@ void QVirtualKeyboardSelectionListModel::removeItem(int index)
 /*!
  * \internal
  */
-QVariant QVirtualKeyboardSelectionListModel::dataAt(int index, int role) const
+QVariant QVirtualKeyboardSelectionListModel::dataAt(int index, QVirtualKeyboardSelectionListModel::Role role) const
 {
-    return data(this->index(index, 0), role);
+    return data(this->index(index, 0), static_cast<int>(role));
 }
 
 /*!
     \internal
 */
-void QVirtualKeyboardSelectionListModel::selectionListChanged(int type)
+void QVirtualKeyboardSelectionListModel::selectionListChanged(QVirtualKeyboardSelectionListModel::Type type)
 {
     Q_D(QVirtualKeyboardSelectionListModel);
     if (static_cast<Type>(type) == d->type) {
@@ -286,7 +294,7 @@ void QVirtualKeyboardSelectionListModel::selectionListChanged(int type)
             d->rowCount = 0;
             endResetModel();
         }
-        if (type == QVirtualKeyboardSelectionListModel::WordCandidateList)
+        if (static_cast<QVirtualKeyboardSelectionListModel::Type>(type) == QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
             d->wclAutoCommitWord = ((oldCount > 1 || (oldCount == 1 && d->wclAutoCommitWord)) && newCount == 1 &&
                                  Settings::instance()->wclAutoCommitWord() &&
                                  dataAt(0).toString().length() > 1);
@@ -298,7 +306,7 @@ void QVirtualKeyboardSelectionListModel::selectionListChanged(int type)
 /*!
     \internal
 */
-void QVirtualKeyboardSelectionListModel::selectionListActiveItemChanged(int type, int index)
+void QVirtualKeyboardSelectionListModel::selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::Type type, int index)
 {
     Q_D(QVirtualKeyboardSelectionListModel);
     if (static_cast<Type>(type) == d->type && index < d->rowCount) {
diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h
index 516d1177..59a3e3a6 100644
--- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h
+++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.h
@@ -48,25 +48,28 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardSelectionListModel : public QAbstr
     explicit QVirtualKeyboardSelectionListModel(QObject *parent = nullptr);
 
 public:
-    enum Type
+    enum class Type
     {
         WordCandidateList = 0
     };
-    enum Role
+    Q_ENUM(Type)
+
+    enum class Role
     {
-        DisplayRole = Qt::DisplayRole,
-        WordCompletionLengthRole = Qt::UserRole + 1,
-        DictionaryTypeRole,
-        CanRemoveSuggestionRole,
+        Display = Qt::DisplayRole,
+        DisplayRole = Display,
+        WordCompletionLength = Qt::UserRole + 1,
+        WordCompletionLengthRole = WordCompletionLength,
+        Dictionary,
+        CanRemoveSuggestion
     };
-    enum DictionaryType
+    Q_ENUM(Role)
+
+    enum class DictionaryType
     {
-        DefaultDictionary = 0,
-        UserDictionary
+        Default = 0,
+        User
     };
-
-    Q_ENUM(Type)
-    Q_ENUM(Role)
     Q_ENUM(DictionaryType)
 
     ~QVirtualKeyboardSelectionListModel();
@@ -80,7 +83,7 @@ public:
 
     Q_INVOKABLE void selectItem(int index);
     Q_INVOKABLE void removeItem(int index);
-    Q_INVOKABLE QVariant dataAt(int index, int role = Qt::DisplayRole) const;
+    Q_INVOKABLE QVariant dataAt(int index, Role role = Role::Display) const;
 
 Q_SIGNALS:
     void countChanged();
@@ -88,8 +91,8 @@ Q_SIGNALS:
     void itemSelected(int index);
 
 protected Q_SLOTS:
-    void selectionListChanged(int type);
-    void selectionListActiveItemChanged(int type, int index);
+    void selectionListChanged(Type type);
+    void selectionListActiveItemChanged(Type type, int index);
 
 private:
     friend class QVirtualKeyboardInputEngine;
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index 836b8bf3..badb6a04 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -54,9 +54,9 @@ public:
         capsLock(false),
         resetWhenVisible(false),
         manualShiftLanguageFilter(QSet<QLocale::Language>() << QLocale::Arabic << QLocale::Persian << QLocale::Hindi << QLocale::Korean << QLocale::Thai),
-        manualCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Cangjie << QVirtualKeyboardInputEngine::Zhuyin << QVirtualKeyboardInputEngine::Hebrew),
-        noAutoUppercaseInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::FullwidthLatin << QVirtualKeyboardInputEngine::Pinyin << QVirtualKeyboardInputEngine::Cangjie << QVirtualKeyboardInputEngine::Zhuyin << QVirtualKeyboardInputEngine::ChineseHandwriting << QVirtualKeyboardInputEngine::JapaneseHandwriting << QVirtualKeyboardInputEngine::KoreanHandwriting),
-        allCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Hiragana << QVirtualKeyboardInputEngine::Katakana)
+        manualCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::Cangjie << QVirtualKeyboardInputEngine::InputMode::Zhuyin << QVirtualKeyboardInputEngine::InputMode::Hebrew),
+        noAutoUppercaseInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::FullwidthLatin << QVirtualKeyboardInputEngine::InputMode::Pinyin << QVirtualKeyboardInputEngine::InputMode::Cangjie << QVirtualKeyboardInputEngine::InputMode::Zhuyin << QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting << QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting << QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting),
+        allCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::Hiragana << QVirtualKeyboardInputEngine::InputMode::Katakana)
     {
     }
 
diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
index 2e183092..358c49ea 100644
--- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
+++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
@@ -265,39 +265,39 @@ InputPanel {
 
     function mapInputMode(inputModeName) {
         if (inputModeName === "Latin")
-            return InputEngine.Latin
+            return InputEngine.InputMode.Latin
         else if (inputModeName === "Numeric")
-            return InputEngine.Numeric
+            return InputEngine.InputMode.Numeric
         else if (inputModeName === "Dialable")
-            return InputEngine.Dialable
+            return InputEngine.InputMode.Dialable
         else if (inputModeName === "Pinyin")
-            return InputEngine.Pinyin
+            return InputEngine.InputMode.Pinyin
         else if (inputModeName === "Cangjie")
-            return InputEngine.Cangjie
+            return InputEngine.InputMode.Cangjie
         else if (inputModeName === "Zhuyin")
-            return InputEngine.Zhuyin
+            return InputEngine.InputMode.Zhuyin
         else if (inputModeName === "Hangul")
-            return InputEngine.Hangul
+            return InputEngine.InputMode.Hangul
         else if (inputModeName === "Hiragana")
-            return InputEngine.Hiragana
+            return InputEngine.InputMode.Hiragana
         else if (inputModeName === "Katakana")
-            return InputEngine.Katakana
+            return InputEngine.InputMode.Katakana
         else if (inputModeName === "FullwidthLatin")
-            return InputEngine.FullwidthLatin
+            return InputEngine.InputMode.FullwidthLatin
         else if (inputModeName === "Greek")
-            return InputEngine.Greek
+            return InputEngine.InputMode.Greek
         else if (inputModeName === "Cyrillic")
-            return InputEngine.Cyrillic
+            return InputEngine.InputMode.Cyrillic
         else if (inputModeName === "Arabic")
-            return InputEngine.Arabic
+            return InputEngine.InputMode.Arabic
         else if (inputModeName === "Hebrew")
-            return InputEngine.Hebrew
+            return InputEngine.InputMode.Hebrew
         else if (inputModeName === "ChineseHandwriting")
-            return InputEngine.ChineseHandwriting
+            return InputEngine.InputMode.ChineseHandwriting
         else if (inputModeName === "JapaneseHandwriting")
-            return InputEngine.JapaneseHandwriting
+            return InputEngine.InputMode.JapaneseHandwriting
         else if (inputModeName === "KoreanHandwriting")
-            return InputEngine.KoreanHandwriting
+            return InputEngine.InputMode.KoreanHandwriting
         else
             return -1
     }
@@ -314,6 +314,75 @@ InputPanel {
         return true
     }
 
+    function testPublicEnums() {
+        // Scoped
+        testcase.verify(InputEngine.TextCase.Lower !== undefined)
+        testcase.verify(InputEngine.TextCase.Upper !== undefined)
+        testcase.verify(InputEngine.InputMode.Latin !== undefined)
+        testcase.verify(InputEngine.InputMode.Numeric !== undefined)
+        testcase.verify(InputEngine.InputMode.Dialable !== undefined)
+        testcase.verify(InputEngine.InputMode.Pinyin !== undefined)
+        testcase.verify(InputEngine.InputMode.Cangjie !== undefined)
+        testcase.verify(InputEngine.InputMode.Zhuyin !== undefined)
+        testcase.verify(InputEngine.InputMode.Hangul !== undefined)
+        testcase.verify(InputEngine.InputMode.Hiragana !== undefined)
+        testcase.verify(InputEngine.InputMode.Katakana !== undefined)
+        testcase.verify(InputEngine.InputMode.FullwidthLatin !== undefined)
+        testcase.verify(InputEngine.InputMode.Greek !== undefined)
+        testcase.verify(InputEngine.InputMode.Cyrillic !== undefined)
+        testcase.verify(InputEngine.InputMode.Arabic !== undefined)
+        testcase.verify(InputEngine.InputMode.Hebrew !== undefined)
+        testcase.verify(InputEngine.InputMode.ChineseHandwriting !== undefined)
+        testcase.verify(InputEngine.InputMode.JapaneseHandwriting !== undefined)
+        testcase.verify(InputEngine.InputMode.KoreanHandwriting !== undefined)
+        testcase.verify(InputEngine.PatternRecognitionMode.None !== undefined)
+        testcase.verify(InputEngine.PatternRecognitionMode.PatternRecognitionDisabled !== undefined)
+        testcase.verify(InputEngine.PatternRecognitionMode.Handwriting !== undefined)
+        testcase.verify(InputEngine.PatternRecognitionMode.HandwritingRecoginition !== undefined)
+        testcase.verify(InputEngine.ReselectFlag.WordBeforeCursor !== undefined)
+        testcase.verify(InputEngine.ReselectFlag.WordAfterCursor !== undefined)
+        testcase.verify(InputEngine.ReselectFlag.WordAtCursor !== undefined)
+        testcase.verify(SelectionListModel.Type.WordCandidateList !== undefined)
+        testcase.verify(SelectionListModel.Role.Display !== undefined)
+        testcase.verify(SelectionListModel.Role.WordCompletionLength !== undefined)
+        testcase.verify(SelectionListModel.Role.Dictionary !== undefined)
+        testcase.verify(SelectionListModel.DictionaryType.Default !== undefined)
+        testcase.verify(SelectionListModel.DictionaryType.User !== undefined)
+        // Unscoped
+        testcase.verify(InputEngine.Lower !== undefined)
+        testcase.verify(InputEngine.Upper !== undefined)
+        testcase.verify(InputEngine.Latin !== undefined)
+        testcase.verify(InputEngine.Numeric !== undefined)
+        testcase.verify(InputEngine.Dialable !== undefined)
+        testcase.verify(InputEngine.Pinyin !== undefined)
+        testcase.verify(InputEngine.Cangjie !== undefined)
+        testcase.verify(InputEngine.Zhuyin !== undefined)
+        testcase.verify(InputEngine.Hangul !== undefined)
+        testcase.verify(InputEngine.Hiragana !== undefined)
+        testcase.verify(InputEngine.Katakana !== undefined)
+        testcase.verify(InputEngine.FullwidthLatin !== undefined)
+        testcase.verify(InputEngine.Greek !== undefined)
+        testcase.verify(InputEngine.Cyrillic !== undefined)
+        testcase.verify(InputEngine.Arabic !== undefined)
+        testcase.verify(InputEngine.Hebrew !== undefined)
+        testcase.verify(InputEngine.ChineseHandwriting !== undefined)
+        testcase.verify(InputEngine.JapaneseHandwriting !== undefined)
+        testcase.verify(InputEngine.KoreanHandwriting !== undefined)
+        testcase.verify(InputEngine.None !== undefined)
+        testcase.verify(InputEngine.PatternRecognitionDisabled !== undefined)
+        testcase.verify(InputEngine.Handwriting !== undefined)
+        testcase.verify(InputEngine.HandwritingRecoginition !== undefined)
+        testcase.verify(InputEngine.WordBeforeCursor !== undefined)
+        testcase.verify(InputEngine.WordAfterCursor !== undefined)
+        testcase.verify(InputEngine.WordAtCursor !== undefined)
+        testcase.verify(SelectionListModel.WordCandidateList !== undefined)
+        testcase.verify(SelectionListModel.DisplayRole !== undefined)
+        testcase.verify(SelectionListModel.WordCompletionLengthRole !== undefined)
+        testcase.verify(SelectionListModel.DictionaryType !== undefined)
+        testcase.verify(SelectionListModel.Default !== undefined)
+        testcase.verify(SelectionListModel.User !== undefined)
+    }
+
     function setExternalLanguageSwitchEnabled(enabled) {
         externalLanguageSwitchEnabled = enabled
     }
@@ -612,8 +681,8 @@ InputPanel {
     function selectionListSuggestionIsFromUserDictionary() {
         if (!inputPanel.wordCandidateView.currentItem)
             return false
-        var dictionaryType = inputPanel.wordCandidateView.model.dataAt(inputPanel.wordCandidateView.currentIndex, SelectionListModel.DictionaryTypeRole)
-        return dictionaryType !== undefined && dictionaryType === SelectionListModel.UserDictionary
+        var dictionaryType = inputPanel.wordCandidateView.model.dataAt(inputPanel.wordCandidateView.currentIndex, SelectionListModel.Role.Dictionary)
+        return dictionaryType !== undefined && dictionaryType === SelectionListModel.DictionaryType.User
     }
 
     function openWordCandidateContextMenu() {
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml
index b3173517..67009c9a 100644
--- a/tests/auto/inputpanel/data/tst_inputpanel.qml
+++ b/tests/auto/inputpanel/data/tst_inputpanel.qml
@@ -218,6 +218,11 @@ Rectangle {
                 obj.destroy()
         }
 
+        function test_publicEnums() {
+            prepareTest()
+            inputPanel.testPublicEnums()
+        }
+
         function test_focusShowKeyboard() {
             container.forceActiveFocus()
             verify(inputPanel.visible === false)
diff --git a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
index e44e57b5..e58b8d66 100644
--- a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
@@ -32,5 +32,5 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     objectName: "en_GB"
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 }
diff --git a/tests/auto/layoutresources/data/layouts/en_GB/main.qml b/tests/auto/layoutresources/data/layouts/en_GB/main.qml
index e44e57b5..e58b8d66 100644
--- a/tests/auto/layoutresources/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutresources/data/layouts/en_GB/main.qml
@@ -32,5 +32,5 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayout {
     objectName: "en_GB"
-    inputMode: InputEngine.Latin
+    inputMode: InputEngine.InputMode.Latin
 }