Remove 'enterprise' from QML imports and QRC prefixes

[ChangeLog] Renamed QML import from "import QtQuick.Enterprise.VirtualKeyboard" to "import QtQuick.VirtualKeyboard", as the module is now open-source. Change-Id: I240a3c1b598ca4aa41d2aad02b6e548622308833 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
author: Mitch Curtis <mitch.curtis@theqtcompany.com> 2016-04-22 08:42:49 +0200
committer: Mitch Curtis <mitch.curtis@theqtcompany.com> 2016-04-26 10:33:58 +0000
commit: a84522bb6a806736fe105dfdfc9b0d0c8f46f2ee (patch)
tree: f9cba3e4030ddb659cca939eeedfe65b5de52b40 /src
parent: 6a07634b20dddb9c67e2a865bfb3227dac103ca4 (diff)
117 files changed, 221 insertions, 221 deletions
diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp
index 99fb7d22..108a0962 100644
--- a/src/virtualkeyboard/abstractinputmethod.cpp
+++ b/src/virtualkeyboard/abstractinputmethod.cpp
@@ -166,7 +166,7 @@ void AbstractInputMethod::selectionListItemSelected(SelectionListModel::Type typ
 }
 
 /*!
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     Returns list of supported pattern recognition modes.
 
@@ -179,7 +179,7 @@ QList<InputEngine::PatternRecognitionMode> AbstractInputMethod::patternRecogniti
 }
 
 /*!
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This method is called when a trace interaction starts with the specified \a patternRecognitionMode.
     The trace is uniquely identified by the \a traceId.
@@ -201,7 +201,7 @@ Trace *AbstractInputMethod::traceBegin(int traceId, InputEngine::PatternRecognit
 }
 
 /*!
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This method is called when the trace interaction ends. The input method should destroy the \a trace object
     at some point after this function is called. See the \l Trace API how to access the gathered
@@ -216,7 +216,7 @@ bool AbstractInputMethod::traceEnd(Trace *trace)
 }
 
 /*!
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This function attempts to reselect a word located at the \a cursorPosition.
     The \a reselectFlags define the rules for how the word should be selected in
diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/content/HandwritingInputPanel.qml
index ff37c503..cf486015 100644
--- a/src/virtualkeyboard/content/HandwritingInputPanel.qml
+++ b/src/virtualkeyboard/content/HandwritingInputPanel.qml
@@ -29,12 +29,12 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.2
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype HandwritingInputPanel
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \inqmlmodule QtQuick.VirtualKeyboard
+    \since QtQuick.VirtualKeyboard 2.0
 
     \brief Provides a handwriting panel add-on for the virtual keyboard UI.
     \ingroup qtvirtualkeyboard-qml
diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml
index 71a5e9b4..f9993e1d 100644
--- a/src/virtualkeyboard/content/InputPanel.qml
+++ b/src/virtualkeyboard/content/InputPanel.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype InputPanel
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
 
     \brief Provides the virtual keyboard UI.
     \ingroup qtvirtualkeyboard-qml
@@ -47,7 +47,7 @@ Item {
     id: inputPanel
 
     /*! \qmlproperty bool Active state of the input panel
-        \since QtQuick.Enterprise.VirtualKeyboard 2.0
+        \since QtQuick.VirtualKeyboard 2.0
 
         This property reflects the active status of the input panel.
         The keyboard should be made visible to user when the active is true.
diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml
index 76006f5f..6eeb4887 100644
--- a/src/virtualkeyboard/content/components/AlternativeKeys.qml
+++ b/src/virtualkeyboard/content/components/AlternativeKeys.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 Item {
     property bool active: listView.currentIndex != -1
diff --git a/src/virtualkeyboard/content/components/BackspaceKey.qml b/src/virtualkeyboard/content/components/BackspaceKey.qml
index a5ae2a70..126f6e2c 100644
--- a/src/virtualkeyboard/content/components/BackspaceKey.qml
+++ b/src/virtualkeyboard/content/components/BackspaceKey.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype BackspaceKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/BaseKey.qml b/src/virtualkeyboard/content/components/BaseKey.qml
index 07facf8a..7cc97306 100644
--- a/src/virtualkeyboard/content/components/BaseKey.qml
+++ b/src/virtualkeyboard/content/components/BaseKey.qml
@@ -32,7 +32,7 @@ import QtQuick.Layouts 1.0
 
 /*!
     \qmltype BaseKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Item
 
@@ -72,7 +72,7 @@ Item {
     */
     property string displayText: text
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         Sets the small text rendered in the corner of the key.
 
@@ -80,7 +80,7 @@ Item {
     */
     property string smallText: effectiveAlternativeKeysHighlightIndex !== -1 ? effectiveAlternativeKeys[effectiveAlternativeKeysHighlightIndex] : ""
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         Sets the visibility of small text.
 
@@ -105,7 +105,7 @@ Item {
     */
     property var alternativeKeys: []
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         This property contains the effective alternative keys presented to user.
 
@@ -119,7 +119,7 @@ Item {
         return alternativeKeys.slice(0, textIndex).concat(alternativeKeys.slice(textIndex + 1))
     }
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         This property contains the index of highlighted item in the \c effectiveAlternativeKeys.
 
@@ -140,7 +140,7 @@ Item {
     */
     property int key: Qt.Key_unknown
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 1.3
+    /*! \since QtQuick.VirtualKeyboard 1.3
 
         This property controls whether the key emits key events for input
         method processing. When true, the key events are disabled.
@@ -156,7 +156,7 @@ Item {
     */
     property bool active: false
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 1.3
+    /*! \since QtQuick.VirtualKeyboard 1.3
 
         Disables key modifiers on the emitted key.
 
@@ -219,7 +219,7 @@ Item {
     property alias keyPanelDelegate: keyPanel.sourceComponent
 
     /*!
-        \since QtQuick.Enterprise.VirtualKeyboard 1.1
+        \since QtQuick.VirtualKeyboard 1.1
 
         This property holds the sound effect to be played on key press.
 
diff --git a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml b/src/virtualkeyboard/content/components/ChangeLanguageKey.qml
index 4025be02..a152ed22 100644
--- a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml
+++ b/src/virtualkeyboard/content/components/ChangeLanguageKey.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype ChangeLanguageKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml
index 584ef3fc..60c5b819 100644
--- a/src/virtualkeyboard/content/components/EnterKey.qml
+++ b/src/virtualkeyboard/content/components/EnterKey.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype EnterKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/FillerKey.qml b/src/virtualkeyboard/content/components/FillerKey.qml
index 79e97816..b06d4aed 100644
--- a/src/virtualkeyboard/content/components/FillerKey.qml
+++ b/src/virtualkeyboard/content/components/FillerKey.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype FillerKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/HandwritingModeKey.qml b/src/virtualkeyboard/content/components/HandwritingModeKey.qml
index f956b2fb..b07cdcd6 100644
--- a/src/virtualkeyboard/content/components/HandwritingModeKey.qml
+++ b/src/virtualkeyboard/content/components/HandwritingModeKey.qml
@@ -31,10 +31,10 @@ import QtQuick 2.0
 
 /*!
     \qmltype HandwritingModeKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Key
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     \brief Hand writing mode key for keyboard layouts.
 
diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml
index 76e76150..41d9a5b9 100644
--- a/src/virtualkeyboard/content/components/HideKeyboardKey.qml
+++ b/src/virtualkeyboard/content/components/HideKeyboardKey.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype HideKeyboardKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/Key.qml b/src/virtualkeyboard/content/components/Key.qml
index 45737de9..620a3a7b 100644
--- a/src/virtualkeyboard/content/components/Key.qml
+++ b/src/virtualkeyboard/content/components/Key.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype Key
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index d4783a6d..68457f7c 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -29,9 +29,9 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
-import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
-import QtQuick.Enterprise.VirtualKeyboard.Settings 2.0
+import QtQuick.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard.Styles 2.0
+import QtQuick.VirtualKeyboard.Settings 2.0
 import Qt.labs.folderlistmodel 2.0
 
 Item {
@@ -75,7 +75,7 @@ Item {
 
     function initDefaultInputMethod() {
         try {
-            return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HunspellInputMethod {}', keyboard, "defaultInputMethod")
+            return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HunspellInputMethod {}', keyboard, "defaultInputMethod")
         } catch (e) { }
         return plainInputMethod
     }
@@ -328,8 +328,8 @@ Item {
         id: layoutsModel
         nameFilters: ["$"]
         Component.onCompleted: {
-            if (InputContext.fileExists("qrc:/QtQuick/Enterprise/VirtualKeyboard/content/layouts"))
-                layoutsModel.folder = "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/layouts"
+            if (InputContext.fileExists("qrc:/QtQuick/VirtualKeyboard/content/layouts"))
+                layoutsModel.folder = "qrc:/QtQuick/VirtualKeyboard/content/layouts"
             else
                 layoutsModel.folder = "../layouts"
         }
@@ -541,7 +541,7 @@ Item {
                 var soundId = Qt.md5(sound)
                 multiSoundEffect = __sounds[soundId]
                 if (!multiSoundEffect) {
-                    multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; MultiSoundEffect {}', soundEffect)
+                    multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; MultiSoundEffect {}', soundEffect)
                     if (multiSoundEffect) {
                         multiSoundEffect.playingChanged.connect(soundEffect.playingChanged)
                         multiSoundEffect.source = sound
diff --git a/src/virtualkeyboard/content/components/KeyboardColumn.qml b/src/virtualkeyboard/content/components/KeyboardColumn.qml
index 2224ff2d..d5b1fbfe 100644
--- a/src/virtualkeyboard/content/components/KeyboardColumn.qml
+++ b/src/virtualkeyboard/content/components/KeyboardColumn.qml
@@ -32,7 +32,7 @@ import QtQuick.Layouts 1.0
 
 /*!
     \qmltype KeyboardColumn
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits ColumnLayout
 
@@ -50,7 +50,7 @@ ColumnLayout {
     */
     property real keyWeight: parent ? parent.keyWeight : undefined
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         Sets the \c smallTextVisible for all children keys.
 
diff --git a/src/virtualkeyboard/content/components/KeyboardLayout.qml b/src/virtualkeyboard/content/components/KeyboardLayout.qml
index 7940b05a..345fb2cd 100644
--- a/src/virtualkeyboard/content/components/KeyboardLayout.qml
+++ b/src/virtualkeyboard/content/components/KeyboardLayout.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype KeyboardLayout
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits ColumnLayout
 
@@ -47,7 +47,7 @@ import QtQuick.Enterprise.VirtualKeyboard 2.0
     \code
     import QtQuick 2.0
     import QtQuick.Layouts 1.0
-    import QtQuick.Enterprise.VirtualKeyboard 2.0
+    import QtQuick.VirtualKeyboard 2.0
 
     // file: layouts/en_GB/main.qml
 
@@ -135,7 +135,7 @@ ColumnLayout {
     */
     property real keyWeight
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         Sets the \c smallTextVisible for all children keys.
 
diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml
index 2849314e..341b9a8a 100644
--- a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml
+++ b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml
@@ -31,10 +31,10 @@ import QtQuick 2.0
 
 /*!
     \qmltype KeyboardLayoutLoader
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Loader
-    \since QtQuick.Enterprise.VirtualKeyboard 1.1
+    \since QtQuick.VirtualKeyboard 1.1
 
     \brief Allows dynamic loading of keyboard layout.
 
@@ -49,7 +49,7 @@ import QtQuick 2.0
     \code
     import QtQuick 2.0
     import QtQuick.Layouts 1.0
-    import QtQuick.Enterprise.VirtualKeyboard 2.0
+    import QtQuick.VirtualKeyboard 2.0
 
     // file: layouts/en_GB/symbols.qml
 
diff --git a/src/virtualkeyboard/content/components/KeyboardRow.qml b/src/virtualkeyboard/content/components/KeyboardRow.qml
index 5dd4c448..5c9db6b2 100644
--- a/src/virtualkeyboard/content/components/KeyboardRow.qml
+++ b/src/virtualkeyboard/content/components/KeyboardRow.qml
@@ -32,7 +32,7 @@ import QtQuick.Layouts 1.0
 
 /*!
     \qmltype KeyboardRow
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits RowLayout
 
@@ -49,7 +49,7 @@ RowLayout {
     */
     property real keyWeight: parent ? parent.keyWeight : undefined
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    /*! \since QtQuick.VirtualKeyboard 2.0
 
         Sets the \c smallTextVisible for all children keys.
 
diff --git a/src/virtualkeyboard/content/components/ModeKey.qml b/src/virtualkeyboard/content/components/ModeKey.qml
index 5176eb3e..5fd24b41 100644
--- a/src/virtualkeyboard/content/components/ModeKey.qml
+++ b/src/virtualkeyboard/content/components/ModeKey.qml
@@ -31,10 +31,10 @@ import QtQuick 2.0
 
 /*!
     \qmltype ModeKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Key
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     \brief Generic mode key for keyboard layouts.
 
diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml
index 4c645d36..680b5523 100644
--- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml
+++ b/src/virtualkeyboard/content/components/MultitapInputMethod.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 InputMethod {
     property string multitapSequence
diff --git a/src/virtualkeyboard/content/components/NumberKey.qml b/src/virtualkeyboard/content/components/NumberKey.qml
index 5f59860c..dfe29912 100644
--- a/src/virtualkeyboard/content/components/NumberKey.qml
+++ b/src/virtualkeyboard/content/components/NumberKey.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype NumberKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Key
 
diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml
index 2a206ada..50948f62 100644
--- a/src/virtualkeyboard/content/components/ShiftKey.qml
+++ b/src/virtualkeyboard/content/components/ShiftKey.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype ShiftKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits BaseKey
 
diff --git a/src/virtualkeyboard/content/components/SpaceKey.qml b/src/virtualkeyboard/content/components/SpaceKey.qml
index 70b7a04d..5bfd25a8 100644
--- a/src/virtualkeyboard/content/components/SpaceKey.qml
+++ b/src/virtualkeyboard/content/components/SpaceKey.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype SpaceKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Key
 
diff --git a/src/virtualkeyboard/content/components/SymbolModeKey.qml b/src/virtualkeyboard/content/components/SymbolModeKey.qml
index 3eaf9a3b..5129c390 100644
--- a/src/virtualkeyboard/content/components/SymbolModeKey.qml
+++ b/src/virtualkeyboard/content/components/SymbolModeKey.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype SymbolModeKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Key
 
diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml
index a18dbbd6..c01251b4 100644
--- a/src/virtualkeyboard/content/components/TraceInputArea.qml
+++ b/src/virtualkeyboard/content/components/TraceInputArea.qml
@@ -29,14 +29,14 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.2
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 /*!
     \qmltype TraceInputArea
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits MultiPointTouchArea
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     \brief A specialized MultiPointTouchArea for collecting touch input data.
 
diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml
index 69fe4812..28740758 100644
--- a/src/virtualkeyboard/content/components/TraceInputKey.qml
+++ b/src/virtualkeyboard/content/components/TraceInputKey.qml
@@ -32,10 +32,10 @@ import QtQuick.Layouts 1.0
 
 /*!
     \qmltype TraceInputKey
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \inherits Item
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     \brief A specialized key for collecting touch input data.
 
diff --git a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
index 476223dd..a134e5f0 100644
--- a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
+++ b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 ListView {
     id: wordCandidatePopupList
diff --git a/src/virtualkeyboard/content/content.qrc b/src/virtualkeyboard/content/content.qrc
index 35375564..bb57425d 100644
--- a/src/virtualkeyboard/content/content.qrc
+++ b/src/virtualkeyboard/content/content.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content">
         <file>InputPanel.qml</file>
         <file>HandwritingInputPanel.qml</file>
         <file>components/AlternativeKeys.qml</file>
diff --git a/src/virtualkeyboard/content/layouts.qrc b/src/virtualkeyboard/content/layouts.qrc
index 91d59b30..b8ed28cd 100644
--- a/src/virtualkeyboard/content/layouts.qrc
+++ b/src/virtualkeyboard/content/layouts.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content">
         <file>layouts/ar_AR/digits.qml</file>
         <file>layouts/ar_AR/main.qml</file>
         <file>layouts/ar_AR/numbers.qml</file>
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
index 835677cc..c12b305c 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
index aac227df..60dd3391 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
index a07ce38b..dbe14bda 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml
index b1bdac90..5e249741 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml b/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/virtualkeyboard/content/layouts/da_DK/main.qml
index 1f9f43ca..cac6d346 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/main.qml
+++ b/src/virtualkeyboard/content/layouts/da_DK/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml b/src/virtualkeyboard/content/layouts/da_DK/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/da_DK/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml b/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/virtualkeyboard/content/layouts/de_DE/main.qml
index 5421569f..7ee4c3a5 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/main.qml
+++ b/src/virtualkeyboard/content/layouts/de_DE/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml b/src/virtualkeyboard/content/layouts/de_DE/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/de_DE/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml b/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml
index 7f82f193..5317f3a2 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/en_GB/digits.qml
index a6afa33f..300576f5 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/digits.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/digits.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
index 03ecc30d..c4ba9782 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.qml b/src/virtualkeyboard/content/layouts/en_GB/main.qml
index d5715405..eaa10822 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/main.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml b/src/virtualkeyboard/content/layouts/en_GB/numbers.qml
index 09ab1c5d..0b5abca1 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/numbers.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
index 0bdab338..f5a62d7c 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/virtualkeyboard/content/layouts/es_ES/main.qml
index c4eab9a8..a030f0d6 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/main.qml
+++ b/src/virtualkeyboard/content/layouts/es_ES/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml
index 5244948e..f631cd46 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
index e6043101..1b2e54a5 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
index c3269bd6..cc9518a1 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
index 35ce3c38..0fd4d0cb 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMethod: PlainInputMethod {}
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml
index 4a7cc32b..35d21df6 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/virtualkeyboard/content/layouts/fi_FI/main.qml
index 39b56ae6..4506a5b2 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml
+++ b/src/virtualkeyboard/content/layouts/fi_FI/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/virtualkeyboard/content/layouts/fr_FR/main.qml
index 3a82a44d..92b71425 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml
+++ b/src/virtualkeyboard/content/layouts/fr_FR/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml
index 057b389f..bb8aeeda 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml
+++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml
index a3eee417..cf405333 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/virtualkeyboard/content/layouts/it_IT/main.qml
index 3ea87cc9..e3520f21 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/main.qml
+++ b/src/virtualkeyboard/content/layouts/it_IT/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml
index 1b479445..4a728b73 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml
+++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod")
     }
     sharedLayouts: ['symbols']
     sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml
index 0875786d..6655d500 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod")
     }
     sharedLayouts: ['main']
     property int page
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml
index ef214b28..1278af91 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml
+++ b/src/virtualkeyboard/content/layouts/ko_KR/main.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod")
     }
     sourceComponent: InputContext.shift ? page2 : page1
     sharedLayouts: ['symbols']
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml
index 0a2f4268..3fcc43d8 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod")
     }
     sharedLayouts: ['main']
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml
index 07a0d9c0..c28cd8ca 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml
+++ b/src/virtualkeyboard/content/layouts/nb_NO/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/virtualkeyboard/content/layouts/pl_PL/main.qml
index 0610556f..c0247568 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml
+++ b/src/virtualkeyboard/content/layouts/pl_PL/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/virtualkeyboard/content/layouts/pt_PT/main.qml
index 7b835d44..5e82690d 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml
+++ b/src/virtualkeyboard/content/layouts/pt_PT/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/virtualkeyboard/content/layouts/ru_RU/main.qml
index 4fa27f62..56ded384 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml
+++ b/src/virtualkeyboard/content/layouts/ru_RU/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml
index 1cac9d3b..c5fac090 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml
index 1a505e7e..151d0c5c 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/virtualkeyboard/content/layouts/sv_SE/main.qml
index 39b56ae6..4506a5b2 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml
+++ b/src/virtualkeyboard/content/layouts/sv_SE/main.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     inputMode: InputEngine.Latin
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml
index 555ef572..7794ac46 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml
@@ -29,7 +29,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     property bool secondPage
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/main.qml b/src/virtualkeyboard/content/layouts/zh_CN/main.qml
index 0b604f13..7240855a 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml
+++ b/src/virtualkeyboard/content/layouts/zh_CN/main.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod")
     }
     sharedLayouts: ['symbols']
     keyWeight: 160
diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml
index c6fe80c0..bb21dc03 100644
--- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod")
     }
     sharedLayouts: ['main']
     property int page
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
index b16ef8fb..ecee8c07 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml
+++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; TCInputMethod {}', parent, "tcInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; TCInputMethod {}', parent, "tcInputMethod")
     }
     sharedLayouts: ['symbols']
     sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cangjie ? pageCangjie : pageZhuyin
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml
index edbda94c..8d9234a1 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml
+++ b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; TCInputMethod {}', parent, "tcInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.0; TCInputMethod {}', parent, "tcInputMethod")
     }
     sharedLayouts: ['main']
     property int page
diff --git a/src/virtualkeyboard/content/layouts_hangul.qrc b/src/virtualkeyboard/content/layouts_hangul.qrc
index a222c1b8..610348ab 100644
--- a/src/virtualkeyboard/content/layouts_hangul.qrc
+++ b/src/virtualkeyboard/content/layouts_hangul.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content">
         <file>layouts/ko_KR/main.qml</file>
         <file>layouts/ko_KR/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_japanese.qrc b/src/virtualkeyboard/content/layouts_japanese.qrc
index 3b70168c..2d837f4e 100644
--- a/src/virtualkeyboard/content/layouts_japanese.qrc
+++ b/src/virtualkeyboard/content/layouts_japanese.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content">
         <file>layouts/ja_JP/main.qml</file>
         <file>layouts/ja_JP/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_pinyin.qrc b/src/virtualkeyboard/content/layouts_pinyin.qrc
index 0b8bf8c0..fe451d0c 100644
--- a/src/virtualkeyboard/content/layouts_pinyin.qrc
+++ b/src/virtualkeyboard/content/layouts_pinyin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content">
         <file>layouts/zh_CN/main.qml</file>
         <file>layouts/zh_CN/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
index 98100014..6fd7a208 100644
--- a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
+++ b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content">
         <file>layouts/zh_TW/main.qml</file>
         <file>layouts/zh_TW/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/styles/default/default_style.qrc b/src/virtualkeyboard/content/styles/default/default_style.qrc
index ef2f2bfa..2d5ee760 100644
--- a/src/virtualkeyboard/content/styles/default/default_style.qrc
+++ b/src/virtualkeyboard/content/styles/default/default_style.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content/styles/default">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content/styles/default">
         <file>style.qml</file>
         <file>images/backspace-868482.svg</file>
         <file>images/check-868482.svg</file>
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index 5b124ac3..d8a9c532 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
-import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+import QtQuick.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard.Styles 2.0
 
 KeyboardStyle {
     id: currentStyle
@@ -38,7 +38,7 @@ KeyboardStyle {
     readonly property real keyBackgroundMargin: Math.round(13 * scaleHint)
     readonly property real keyContentMargin: Math.round(45 * scaleHint)
     readonly property real keyIconScale: scaleHint * 0.6
-    readonly property string resourcePrefix: "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/styles/default/"
+    readonly property string resourcePrefix: "qrc:/QtQuick/VirtualKeyboard/content/styles/default/"
 
     readonly property string inputLocale: InputContext.locale
     property color inputLocaleIndicatorColor: "white"
diff --git a/src/virtualkeyboard/content/styles/retro/retro_style.qrc b/src/virtualkeyboard/content/styles/retro/retro_style.qrc
index 2a8f0aa8..cf60d814 100644
--- a/src/virtualkeyboard/content/styles/retro/retro_style.qrc
+++ b/src/virtualkeyboard/content/styles/retro/retro_style.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content/styles/retro">
+    <qresource prefix="/QtQuick/VirtualKeyboard/content/styles/retro">
         <file>style.qml</file>
         <file>images/key154px_black.png</file>
         <file>images/key154px_black_long.png</file>
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index a5c895ee..ac2f0035 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
-import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+import QtQuick.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard.Styles 2.0
 
 KeyboardStyle {
     id: currentStyle
@@ -38,7 +38,7 @@ KeyboardStyle {
     readonly property real keyBackgroundMargin: Math.round(9 * scaleHint)
     readonly property real keyContentMargin: Math.round(30 * scaleHint)
     readonly property real keyIconScale: scaleHint * 0.6
-    readonly property string resourcePath: "QtQuick/Enterprise/VirtualKeyboard/content/styles/retro/"
+    readonly property string resourcePath: "QtQuick/VirtualKeyboard/content/styles/retro/"
     readonly property string resourcePrefix: "qrc:/" + resourcePath
 
     readonly property string inputLocale: InputContext.locale
diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp
index f7050b6e..05fc2b96 100644
--- a/src/virtualkeyboard/desktopinputpanel.cpp
+++ b/src/virtualkeyboard/desktopinputpanel.cpp
@@ -135,7 +135,7 @@ void DesktopInputPanel::createView()
         d->view->setFlags(d->view->flags() | Qt::ToolTip);
 #endif
         d->view->setColor(QColor(Qt::transparent));
-        d->view->setSource(QUrl("qrc:///QtQuick/Enterprise/VirtualKeyboard/content/InputPanel.qml"));
+        d->view->setSource(QUrl("qrc:///QtQuick/VirtualKeyboard/content/InputPanel.qml"));
         connect(qGuiApp, SIGNAL(aboutToQuit()), SLOT(destroyView()));
     }
 }
diff --git a/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml b/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml
index 795af69a..4f5b1f08 100644
--- a/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml
+++ b/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt.Quick.Enterprise.VirtualKeyboard 1.0
+import QtQuick.VirtualKeyboard 1.0
 
 // file: CustomInputMethod.qml
 
diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc
index a87c5032..da36206b 100644
--- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc
@@ -58,12 +58,12 @@ in Qt Creator that executes the \c {make install} command.
     \li \c /system/plugins/platforminputcontexts
 \row
     \li qtvirtualkeyboardplugin QML files
-    \li \c $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard
-    \li \c /system/qml/QtQuick/Enterprise/VirtualKeyboard
+    \li \c $$[QT_INSTALL_QML]/QtQuick/VirtualKeyboard
+    \li \c /system/qml/QtQuick/VirtualKeyboard
 \row
     \li qtvirtualkeyboardstylesplugin
-    \li \c $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles
-    \li \c /system/qml/QtQuick/Enterprise/VirtualKeyboard/Styles
+    \li \c $$[QT_INSTALL_QML]/QtQuick/VirtualKeyboard/Styles
+    \li \c /system/qml/QtQuick/VirtualKeyboard/Styles
 \endtable
 
 \section1 Integration Method
@@ -117,7 +117,7 @@ divide the screen area with the application container.
 
 \code
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 2.0
+import QtQuick.VirtualKeyboard 2.0
 
 Item {
     id: root
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index 6161bfaa..0e723e16 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -412,7 +412,7 @@ For example, to add a regular key which sends a key event to the input method:
 \code
     import QtQuick 2.0
     import QtQuick.Layouts 1.0
-    import QtQuick.Enterprise.VirtualKeyboard 2.0
+    import QtQuick.VirtualKeyboard 2.0
 
     // file: layouts/en_GB/main.qml
 
@@ -445,7 +445,7 @@ example, we add another key which specifies a custom key weight:
 \code
     import QtQuick 2.0
     import QtQuick.Layouts 1.0
-    import QtQuick.Enterprise.VirtualKeyboard 2.0
+    import QtQuick.VirtualKeyboard 2.0
 
     // file: layouts/en_GB/main.qml
 
@@ -503,7 +503,7 @@ For example:
 \code
     import QtQuick 2.0
     import QtQuick.Layouts 1.0
-    import QtQuick.Enterprise.VirtualKeyboard 2.0
+    import QtQuick.VirtualKeyboard 2.0
 
     // file: layouts/en_GB/symbols.qml
 
@@ -570,7 +570,7 @@ the built-in style, e.g. "retro", or any of the custom styles installed
 into the Styles directory:
 
 \code
-$$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles
+$$[QT_INSTALL_QML]/QtQuick/VirtualKeyboard/Styles
 \endcode
 
 In case the environment variable is not set, or contains an invalid
diff --git a/src/virtualkeyboard/enterkeyaction.cpp b/src/virtualkeyboard/enterkeyaction.cpp
index 1e8db702..13b6246b 100644
--- a/src/virtualkeyboard/enterkeyaction.cpp
+++ b/src/virtualkeyboard/enterkeyaction.cpp
@@ -34,7 +34,7 @@ namespace QtVirtualKeyboard {
 
 /*!
     \qmltype EnterKeyAction
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Provides attached properties for customizing the enter key.
 
diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index b28c32c0..147319ce 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -54,7 +54,7 @@ bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMeth
 QT_END_NAMESPACE
 
 /*!
-    \qmlmodule QtQuick.Enterprise.VirtualKeyboard 2.0
+    \qmlmodule QtQuick.VirtualKeyboard 2.0
 
     This module provides a collection of QML components for Qt Virtual Keyboard.
 */
@@ -143,7 +143,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags)
 /*!
     \qmltype InputContext
     \instantiates QtVirtualKeyboard::InputContext
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Provides access to an input context.
 
diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp
index 9f3d037b..9b6b3a5f 100644
--- a/src/virtualkeyboard/inputengine.cpp
+++ b/src/virtualkeyboard/inputengine.cpp
@@ -116,7 +116,7 @@ private:
 
 /*!
     \qmltype InputEngine
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \instantiates QtVirtualKeyboard::InputEngine
     \brief Maps the user input to the input methods.
@@ -486,7 +486,7 @@ QList<int> InputEngine::patternRecognitionModes() const
 
 /*!
     \qmlmethod Trace InputEngine::traceBegin(int traceId, int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo)
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     Starts a trace interaction with the input engine.
 
@@ -506,7 +506,7 @@ QList<int> InputEngine::patternRecognitionModes() const
     The trace interaction is ended by calling the \l {InputEngine::traceEnd()} {InputEngine.traceEnd()} method.
 */
 /*!
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     Starts a trace interaction with the input engine.
 
@@ -575,7 +575,7 @@ bool InputEngine::traceEnd(QtVirtualKeyboard::Trace *trace)
 }
 
 /*!
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This function attempts to reselect a word located at the \a cursorPosition.
     The \a reselectFlags define the rules for how the word should be selected in
@@ -851,14 +851,14 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent)
 
 /*!
     \qmlproperty list<int> InputEngine::patternRecognitionModes
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     The list of available pattern recognition modes.
 */
 
 /*!
     \property QtVirtualKeyboard::InputEngine::patternRecognitionModes
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
     \brief the list of available pattern recognition modes.
 
     The list of available pattern recognition modes.
@@ -958,7 +958,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent)
 
 /*!
     \qmlsignal void InputEngine::patternRecognitionModesChanged()
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     Indicates that the available pattern recognition modes have changed.
 
@@ -972,7 +972,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent)
 
 /*!
     \fn void QtVirtualKeyboard::InputEngine::patternRecognitionModesChanged()
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     Indicates that the available pattern recognition modes have changed.
 */
diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp
index ae969b60..7c91ab2f 100644
--- a/src/virtualkeyboard/inputmethod.cpp
+++ b/src/virtualkeyboard/inputmethod.cpp
@@ -36,7 +36,7 @@ namespace QtVirtualKeyboard {
 /*!
     \qmltype InputMethod
     \instantiates QtVirtualKeyboard::InputMethod
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Base type for creating input method in QML.
 
@@ -164,7 +164,7 @@ namespace QtVirtualKeyboard {
 
 /*!
     \qmlmethod list<int> InputMethod::patternRecognitionModes()
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     Returns list of supported pattern recognition modes.
 
@@ -174,7 +174,7 @@ namespace QtVirtualKeyboard {
 
 /*!
     \qmlmethod Trace InputMethod::traceBegin(int traceId, int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo)
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This method is called when a trace interaction starts with the specified \a patternRecognitionMode.
     The trace is uniquely identified by the \a traceId.
@@ -189,7 +189,7 @@ namespace QtVirtualKeyboard {
 
 /*!
     \qmlmethod bool InputMethod::traceEnd(Trace trace)
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This method is called when the trace interaction ends. The input method should destroy the \a trace object
     at some point after this function is called. See the \l Trace API how to access the gathered
@@ -198,7 +198,7 @@ namespace QtVirtualKeyboard {
 
 /*!
     \qmlmethod bool InputMethod::reselect(int cursorPosition, int reselectFlags)
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This method attempts to reselect a word located at the \a cursorPosition.
     The \a reselectFlags define the rules for how the word should be selected in
diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp
index 99b3c02c..6debb3cb 100644
--- a/src/virtualkeyboard/plugin.cpp
+++ b/src/virtualkeyboard/plugin.cpp
@@ -77,8 +77,8 @@ Q_LOGGING_CATEGORY(qlcVirtualKeyboard, "qt.virtualkeyboard")
 
 static const char pluginName[] = "qtvirtualkeyboard";
 static const char inputMethodEnvVarName[] = "QT_IM_MODULE";
-static const char pluginUri[] = "QtQuick.Enterprise.VirtualKeyboard";
-static const char pluginSettingsUri[] = "QtQuick.Enterprise.VirtualKeyboard.Settings";
+static const char pluginUri[] = "QtQuick.VirtualKeyboard";
+static const char pluginSettingsUri[] = "QtQuick.VirtualKeyboard.Settings";
 
 static QPointer<PlatformInputContext> platformInputContext;
 
@@ -185,7 +185,7 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
     qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 2, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
     qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 2, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
 
-    const QString path(QStringLiteral("qrc:///QtQuick/Enterprise/VirtualKeyboard/content/"));
+    const QString path(QStringLiteral("qrc:///QtQuick/VirtualKeyboard/content/"));
     qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 0, "InputPanel");
     qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 2, "InputPanel");
     qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 3, "InputPanel");
diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp
index d8e1a673..32e6096f 100644
--- a/src/virtualkeyboard/selectionlistmodel.cpp
+++ b/src/virtualkeyboard/selectionlistmodel.cpp
@@ -53,7 +53,7 @@ public:
 /*!
     \qmltype SelectionListModel
     \instantiates QtVirtualKeyboard::SelectionListModel
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Provides a data model for the selection lists.
 
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index d839606c..cdb6baa9 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -66,7 +66,7 @@ public:
 
 /*!
     \qmltype ShiftHandler
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \instantiates QtVirtualKeyboard::ShiftHandler
     \brief Manages the shift state.
diff --git a/src/virtualkeyboard/styles/KeyIcon.qml b/src/virtualkeyboard/styles/KeyIcon.qml
index be96fc4f..645fe11e 100644
--- a/src/virtualkeyboard/styles/KeyIcon.qml
+++ b/src/virtualkeyboard/styles/KeyIcon.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype KeyIcon
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
+    \inqmlmodule QtQuick.VirtualKeyboard.Styles
     \brief Key icon with adjustable color.
     \ingroup qtvirtualkeyboard-styles-qml
 
diff --git a/src/virtualkeyboard/styles/KeyPanel.qml b/src/virtualkeyboard/styles/KeyPanel.qml
index a86d9eae..68bb0850 100644
--- a/src/virtualkeyboard/styles/KeyPanel.qml
+++ b/src/virtualkeyboard/styles/KeyPanel.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype KeyPanel
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
+    \inqmlmodule QtQuick.VirtualKeyboard.Styles
     \brief A base type of the styled keys.
     \ingroup qtvirtualkeyboard-styles-qml
 
@@ -59,7 +59,7 @@ Item {
     property Item control
 
     /*!
-        \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+        \since QtQuick.VirtualKeyboard.Styles 1.1
 
         Sets the sound effect to be played on key press.
     */
diff --git a/src/virtualkeyboard/styles/KeyboardStyle.qml b/src/virtualkeyboard/styles/KeyboardStyle.qml
index 61f4e05f..681f148a 100644
--- a/src/virtualkeyboard/styles/KeyboardStyle.qml
+++ b/src/virtualkeyboard/styles/KeyboardStyle.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype KeyboardStyle
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
+    \inqmlmodule QtQuick.VirtualKeyboard.Styles
     \brief Provides a styling interface for the Virtual Keyboard.
     \ingroup qtvirtualkeyboard-styles-qml
 
@@ -274,14 +274,14 @@ QtObject {
     /*! Template for the selection list background. */
     property Component selectionListBackground: null
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.3
+    /*! \since QtQuick.VirtualKeyboard.Styles 1.3
 
         This property holds the transition to apply to items that
         are added to the selection list view.
     */
     property Transition selectionListAdd
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.3
+    /*! \since QtQuick.VirtualKeyboard.Styles 1.3
 
         This property holds the transition to apply to items that
         are removed from the selection list view.
@@ -289,7 +289,7 @@ QtObject {
     property Transition selectionListRemove
 
     /*!
-        \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+        \since QtQuick.VirtualKeyboard.Styles 1.1
 
         Template for the navigation highlight item.
 
@@ -302,7 +302,7 @@ QtObject {
     property Component navigationHighlight: null
 
     /*!
-        \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+        \since QtQuick.VirtualKeyboard.Styles 2.0
 
         Template for the trace input key.
 
@@ -311,7 +311,7 @@ QtObject {
     property Component traceInputKeyPanelDelegate: null
 
     /*!
-        \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+        \since QtQuick.VirtualKeyboard.Styles 2.0
 
         Template for rendering a Trace object.
 
@@ -319,7 +319,7 @@ QtObject {
     */
     property Component traceCanvasDelegate: null
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+    /*! \since QtQuick.VirtualKeyboard.Styles 2.0
 
         Template for the popup list item.
 
@@ -334,7 +334,7 @@ QtObject {
     */
     property Component popupListDelegate: null
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+    /*! \since QtQuick.VirtualKeyboard.Styles 2.0
 
         Template for the popup list highlight.
 
@@ -342,20 +342,20 @@ QtObject {
     */
     property Component popupListHighlight: null
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+    /*! \since QtQuick.VirtualKeyboard.Styles 2.0
 
         Template for the popup list background.
     */
     property Component popupListBackground: null
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+    /*! \since QtQuick.VirtualKeyboard.Styles 2.0
 
         This property holds the transition to apply to items that
         are added to the popup list view.
     */
     property Transition popupListAdd
 
-    /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+    /*! \since QtQuick.VirtualKeyboard.Styles 2.0
 
         This property holds the transition to apply to items that
         are removed from the popup list view.
diff --git a/src/virtualkeyboard/styles/SelectionListItem.qml b/src/virtualkeyboard/styles/SelectionListItem.qml
index 05f1b7a9..f3c9fdc9 100644
--- a/src/virtualkeyboard/styles/SelectionListItem.qml
+++ b/src/virtualkeyboard/styles/SelectionListItem.qml
@@ -31,7 +31,7 @@ import QtQuick 2.0
 
 /*!
     \qmltype SelectionListItem
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
+    \inqmlmodule QtQuick.VirtualKeyboard.Styles
     \brief A base type for selection list item delegates.
     \ingroup qtvirtualkeyboard-styles-qml
 
@@ -44,7 +44,7 @@ Item {
     height: parent.height
 
     /*!
-        \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1
+        \since QtQuick.VirtualKeyboard.Styles 1.1
 
         Sets the sound effect to be played on touch event.
     */
diff --git a/src/virtualkeyboard/styles/TraceCanvas.qml b/src/virtualkeyboard/styles/TraceCanvas.qml
index 45407fec..ffee8538 100644
--- a/src/virtualkeyboard/styles/TraceCanvas.qml
+++ b/src/virtualkeyboard/styles/TraceCanvas.qml
@@ -32,11 +32,11 @@ import "TraceUtils.js" as TraceUtils
 
 /*!
     \qmltype TraceCanvas
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
+    \inqmlmodule QtQuick.VirtualKeyboard.Styles
     \brief A specialized Canvas type for rendering Trace objects.
     \ingroup qtvirtualkeyboard-styles-qml
     \inherits Canvas
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This type provides capabilities for rendering Trace objects on the screen.
 
diff --git a/src/virtualkeyboard/styles/TraceInputKeyPanel.qml b/src/virtualkeyboard/styles/TraceInputKeyPanel.qml
index 171a696c..d128a12b 100644
--- a/src/virtualkeyboard/styles/TraceInputKeyPanel.qml
+++ b/src/virtualkeyboard/styles/TraceInputKeyPanel.qml
@@ -31,10 +31,10 @@ import QtQuick 2.0
 
 /*!
     \qmltype TraceInputKeyPanel
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles
+    \inqmlmodule QtQuick.VirtualKeyboard.Styles
     \brief A base type of the trace input key.
     \ingroup qtvirtualkeyboard-styles-qml
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
 
     This type provides panel for decorating TraceInputKey
     items in the keyboard layout.
diff --git a/src/virtualkeyboard/styles/qmldir b/src/virtualkeyboard/styles/qmldir
index b3c810d5..26544a54 100644
--- a/src/virtualkeyboard/styles/qmldir
+++ b/src/virtualkeyboard/styles/qmldir
@@ -1,4 +1,4 @@
-module QtQuick.Enterprise.VirtualKeyboard.Styles
+module QtQuick.VirtualKeyboard.Styles
 plugin qtvirtualkeyboardstylesplugin
 classname QtVirtualKeyboardStylesPlugin
 typeinfo plugins.qmltypes
diff --git a/src/virtualkeyboard/styles/styles.pro b/src/virtualkeyboard/styles/styles.pro
index 237c8473..f5ce051f 100644
--- a/src/virtualkeyboard/styles/styles.pro
+++ b/src/virtualkeyboard/styles/styles.pro
@@ -1,5 +1,5 @@
 TARGET = qtvirtualkeyboardstylesplugin
-TARGETPATH = QtQuick/Enterprise/VirtualKeyboard/Styles
+TARGETPATH = QtQuick/VirtualKeyboard/Styles
 QT += qml quick svg
 
 CONFIG += no_cxx_module
diff --git a/src/virtualkeyboard/styles/styles.qrc b/src/virtualkeyboard/styles/styles.qrc
index df80b80b..39ca357b 100644
--- a/src/virtualkeyboard/styles/styles.qrc
+++ b/src/virtualkeyboard/styles/styles.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/Styles/content">
+    <qresource prefix="/QtQuick/VirtualKeyboard/Styles/content">
         <file>KeyboardStyle.qml</file>
         <file>KeyIcon.qml</file>
         <file>KeyPanel.qml</file>
diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp
index 008941ce..590eed92 100644
--- a/src/virtualkeyboard/styles/styles_plugin.cpp
+++ b/src/virtualkeyboard/styles/styles_plugin.cpp
@@ -34,7 +34,7 @@
 #include <QtCore/QLibraryInfo>
 
 /*!
-    \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 2.0
+    \qmlmodule QtQuick.VirtualKeyboard.Styles 2.0
 
     This module provides styling components for the Qt Virtual Keyboard.
 */
@@ -42,7 +42,7 @@
 void QtVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
 {
     Q_INIT_RESOURCE(styles);
-    const QString path(QStringLiteral("qrc:///QtQuick/Enterprise/VirtualKeyboard/Styles/content/"));
+    const QString path(QStringLiteral("qrc:///QtQuick/VirtualKeyboard/Styles/content/"));
     qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 0, "KeyboardStyle");
     qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 1, "KeyboardStyle");
     qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 2, "KeyboardStyle");
diff --git a/src/virtualkeyboard/trace.cpp b/src/virtualkeyboard/trace.cpp
index c93d4022..cdbaa0d0 100644
--- a/src/virtualkeyboard/trace.cpp
+++ b/src/virtualkeyboard/trace.cpp
@@ -52,7 +52,7 @@ public:
 /*!
     \class QtVirtualKeyboard::Trace
     \inmodule qtvirtualkeyboard
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
     \brief Trace is a data model for touch input data.
 
     Trace provides the data model for coordinate data and other
@@ -114,9 +114,9 @@ public:
 /*!
     \qmltype Trace
     \instantiates QtVirtualKeyboard::Trace
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
+    \inqmlmodule QtQuick.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
-    \since QtQuick.Enterprise.VirtualKeyboard 2.0
+    \since QtQuick.VirtualKeyboard 2.0
     \brief Trace is a data model for touch input data.
 
     Trace provides the data model for coordinate data and other
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index 41a9dc95..5152999f 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -338,7 +338,7 @@ arrow-key-navigation: DEFINES += QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION
 
 include(generateresource.pri)
 
-RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/Enterprise/VirtualKeyboard)
+RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/VirtualKeyboard)
 
 PLUGIN_TYPE = platforminputcontexts
 PLUGIN_EXTENDS = -
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index f1b8e36f..1bc87583 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -65,12 +65,12 @@ public:
     QString styleImportPath(const QString &name) const
     {
         QStringList styleImportPathList;
-        styleImportPathList << "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/styles/";
+        styleImportPathList << "qrc:/QtQuick/VirtualKeyboard/content/styles/";
         const QStringList importPathList = engine->importPathList();
         // Add QML import path (Note: the QML base dir is usually the last entry in the list)
         for (int i = importPathList.size() - 1; i >= 0; --i) {
             const QString stylesPath = importPathList.at(i)
-                + QStringLiteral("/QtQuick/Enterprise/VirtualKeyboard/Styles/");
+                + QStringLiteral("/QtQuick/VirtualKeyboard/Styles/");
             if (QFileInfo(stylesPath).isDir()) {
                 styleImportPathList += stylesPath;
                 break;
@@ -96,16 +96,16 @@ public:
 };
 
 /*!
-    \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings 2.0
+    \qmlmodule QtQuick.VirtualKeyboard.Settings 2.0
 
     This module provides settings components for Qt Virtual Keyboard.
 */
 
 /*!
     \qmltype VirtualKeyboardSettings
-    \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings
+    \inqmlmodule QtQuick.VirtualKeyboard.Settings
     \ingroup qtvirtualkeyboard-settings-qml
-    \since QtQuick.Enterprise.VirtualKeyboard 1.2
+    \since QtQuick.VirtualKeyboard 1.2
     \brief Provides settings for virtual keyboard.
 
     This module provides VirtualKeyboarSettings singleton instance,
@@ -256,7 +256,7 @@ void VirtualKeyboardSettings::resetStyle()
 
 /*!
     \qmlproperty string VirtualKeyboardSettings::locale
-    \since QtQuick.Enterprise.VirtualKeyboard.Settings 2.0
+    \since QtQuick.VirtualKeyboard.Settings 2.0
 
     This property provides the default locale for the keyboard.
 
@@ -272,7 +272,7 @@ void VirtualKeyboardSettings::resetStyle()
 
 /*!
     \qmlproperty list<string> VirtualKeyboardSettings::availableLocales
-    \since QtQuick.Enterprise.VirtualKeyboard.Settings 2.0
+    \since QtQuick.VirtualKeyboard.Settings 2.0
 
     This property contains a list of languages supported by the virtual keyboard.
 
@@ -282,7 +282,7 @@ void VirtualKeyboardSettings::resetStyle()
 
 /*!
     \qmlproperty list<string> VirtualKeyboardSettings::activeLocales
-    \since QtQuick.Enterprise.VirtualKeyboard.Settings 2.0
+    \since QtQuick.VirtualKeyboard.Settings 2.0
 
     This property contains a list of activated languages of the virtual keyboard.
author	Mitch Curtis <mitch.curtis@theqtcompany.com>	2016-04-22 08:42:49 +0200
committer	Mitch Curtis <mitch.curtis@theqtcompany.com>	2016-04-26 10:33:58 +0000
commit	a84522bb6a806736fe105dfdfc9b0d0c8f46f2ee (patch)
tree	f9cba3e4030ddb659cca939eeedfe65b5de52b40 /src
parent	6a07634b20dddb9c67e2a865bfb3227dac103ca4 (diff)