diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-20 15:09:30 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-22 08:40:31 +0000 |
| commit | 5a8ba17bbbf3e5c5ee0b9a111c02547d0007c983 (patch) | |
| tree | 522d3aceba39d4bc287895831995002be109bcff | |
| parent | 2204663adad9d372197398cbde242d1b698096a1 (diff) | |
Remove all version numbers from QML imports
As of Qt 6, the latest version will be used by default. This saves us a
lot of effort in terms of version bumps.
A similar change was done to qtquickcontrols2 in
d451cab0c8b727fa7f12a169a3d6ee449a3a1902.
Change-Id: I092b8a5988b69f3018f8199cac2aeaaafdf4bc38
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
133 files changed, 406 insertions, 406 deletions
diff --git a/examples/virtualkeyboard/basic/Basic.qml b/examples/virtualkeyboard/basic/Basic.qml index 3df811ac..2fb42197 100644 --- a/examples/virtualkeyboard/basic/Basic.qml +++ b/examples/virtualkeyboard/basic/Basic.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.3 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Controls +import QtQuick.VirtualKeyboard import "content" Rectangle { diff --git a/examples/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml index 5b7803ec..274599cb 100644 --- a/examples/virtualkeyboard/basic/basic-b2qt.qml +++ b/examples/virtualkeyboard/basic/basic-b2qt.qml @@ -27,12 +27,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6. -import QtQml 2.14 -import QtQuick.Window 2.2 -import QtQuick.VirtualKeyboard 2.2 -import QtQuick.VirtualKeyboard.Settings 2.2 +import QtQml +import QtQuick.Window +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Settings import "content" Item { diff --git a/examples/virtualkeyboard/basic/content/AutoScroller.qml b/examples/virtualkeyboard/basic/content/AutoScroller.qml index 9df74b7a..529791d1 100644 --- a/examples/virtualkeyboard/basic/content/AutoScroller.qml +++ b/examples/virtualkeyboard/basic/content/AutoScroller.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard Item { diff --git a/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml index 6b2f9dbc..21ac3444 100644 --- a/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml +++ b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Item { id: handwritingModeButton diff --git a/examples/virtualkeyboard/basic/content/TextArea.qml b/examples/virtualkeyboard/basic/content/TextArea.qml index 899882ab..bc83310f 100644 --- a/examples/virtualkeyboard/basic/content/TextArea.qml +++ b/examples/virtualkeyboard/basic/content/TextArea.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 as Controls -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Controls as Controls +import QtQuick.VirtualKeyboard Controls.TextArea { id: control diff --git a/examples/virtualkeyboard/basic/content/TextField.qml b/examples/virtualkeyboard/basic/content/TextField.qml index 6ce4f61c..16ed0cdd 100644 --- a/examples/virtualkeyboard/basic/content/TextField.qml +++ b/examples/virtualkeyboard/basic/content/TextField.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 as Controls -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Controls as Controls +import QtQuick.VirtualKeyboard Controls.TextField { id: control diff --git a/src/styles/KeyIcon.qml b/src/styles/KeyIcon.qml index 645fe11e..a5e77131 100644 --- a/src/styles/KeyIcon.qml +++ b/src/styles/KeyIcon.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype KeyIcon diff --git a/src/styles/KeyPanel.qml b/src/styles/KeyPanel.qml index 4e12b9a8..4bc0ad6c 100644 --- a/src/styles/KeyPanel.qml +++ b/src/styles/KeyPanel.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype KeyPanel diff --git a/src/styles/KeyboardStyle.qml b/src/styles/KeyboardStyle.qml index c3a6f4dd..fbe85331 100644 --- a/src/styles/KeyboardStyle.qml +++ b/src/styles/KeyboardStyle.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype KeyboardStyle diff --git a/src/styles/SelectionListItem.qml b/src/styles/SelectionListItem.qml index bea759ed..d1a40758 100644 --- a/src/styles/SelectionListItem.qml +++ b/src/styles/SelectionListItem.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype SelectionListItem diff --git a/src/styles/TraceCanvas.qml b/src/styles/TraceCanvas.qml index ce8f03a7..e0192c12 100644 --- a/src/styles/TraceCanvas.qml +++ b/src/styles/TraceCanvas.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick import "TraceUtils.js" as TraceUtils /*! diff --git a/src/styles/TraceInputKeyPanel.qml b/src/styles/TraceInputKeyPanel.qml index d128a12b..5a53b42f 100644 --- a/src/styles/TraceInputKeyPanel.qml +++ b/src/styles/TraceInputKeyPanel.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype TraceInputKeyPanel diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/content/HandwritingInputPanel.qml index 4fe4fbc3..64cb1588 100644 --- a/src/virtualkeyboard/content/HandwritingInputPanel.qml +++ b/src/virtualkeyboard/content/HandwritingInputPanel.qml @@ -27,11 +27,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6. -import QtQml 2.14 -import QtQuick.Window 2.2 -import QtQuick.VirtualKeyboard 2.1 +import QtQml +import QtQuick.Window +import QtQuick.VirtualKeyboard /*! \qmltype HandwritingInputPanel diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml index f511eab2..4f7c6ad3 100644 --- a/src/virtualkeyboard/content/InputPanel.qml +++ b/src/virtualkeyboard/content/InputPanel.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6. -import QtQml 2.14 -import QtQuick.VirtualKeyboard 2.1 +import QtQml +import QtQuick.VirtualKeyboard /*! \qmltype InputPanel diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml index 7879f006..39135aee 100644 --- a/src/virtualkeyboard/content/components/AlternativeKeys.qml +++ b/src/virtualkeyboard/content/components/AlternativeKeys.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard Item { property bool active: listView.currentIndex != -1 diff --git a/src/virtualkeyboard/content/components/BackspaceKey.qml b/src/virtualkeyboard/content/components/BackspaceKey.qml index 126f6e2c..3b148a9b 100644 --- a/src/virtualkeyboard/content/components/BackspaceKey.qml +++ b/src/virtualkeyboard/content/components/BackspaceKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype BackspaceKey diff --git a/src/virtualkeyboard/content/components/BaseKey.qml b/src/virtualkeyboard/content/components/BaseKey.qml index ae3b530f..5f964cb4 100644 --- a/src/virtualkeyboard/content/components/BaseKey.qml +++ b/src/virtualkeyboard/content/components/BaseKey.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard /*! \qmltype BaseKey diff --git a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml b/src/virtualkeyboard/content/components/ChangeLanguageKey.qml index 70e12fa4..be5d3456 100644 --- a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml +++ b/src/virtualkeyboard/content/components/ChangeLanguageKey.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Styles 2.1 +import QtQuick +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Styles /*! \qmltype ChangeLanguageKey diff --git a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml b/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml index ee70e110..69821c58 100644 --- a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml +++ b/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard Item { property bool active diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml index 9f7c04da..350b796c 100644 --- a/src/virtualkeyboard/content/components/EnterKey.qml +++ b/src/virtualkeyboard/content/components/EnterKey.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard /*! \qmltype EnterKey diff --git a/src/virtualkeyboard/content/components/FillerKey.qml b/src/virtualkeyboard/content/components/FillerKey.qml index b06d4aed..f0e597ee 100644 --- a/src/virtualkeyboard/content/components/FillerKey.qml +++ b/src/virtualkeyboard/content/components/FillerKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype FillerKey diff --git a/src/virtualkeyboard/content/components/HandwritingModeKey.qml b/src/virtualkeyboard/content/components/HandwritingModeKey.qml index 815d89db..5bc83022 100644 --- a/src/virtualkeyboard/content/components/HandwritingModeKey.qml +++ b/src/virtualkeyboard/content/components/HandwritingModeKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype HandwritingModeKey diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml index ab38fbc2..b3b336bd 100644 --- a/src/virtualkeyboard/content/components/HideKeyboardKey.qml +++ b/src/virtualkeyboard/content/components/HideKeyboardKey.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard /*! \qmltype HideKeyboardKey diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/virtualkeyboard/content/components/InputModeKey.qml index f7b31b9b..8c799ba6 100644 --- a/src/virtualkeyboard/content/components/InputModeKey.qml +++ b/src/virtualkeyboard/content/components/InputModeKey.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard /*! \qmltype InputModeKey diff --git a/src/virtualkeyboard/content/components/Key.qml b/src/virtualkeyboard/content/components/Key.qml index 5a376310..9c72d717 100644 --- a/src/virtualkeyboard/content/components/Key.qml +++ b/src/virtualkeyboard/content/components/Key.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype Key diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index d6073d4e..f93332aa 100644 --- a/src/virtualkeyboard/content/components/Keyboard.qml +++ b/src/virtualkeyboard/content/components/Keyboard.qml @@ -27,16 +27,16 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6. -import QtQml 2.14 -import QtQuick.Layouts 1.0 -import QtQuick.Window 2.2 -import QtQuick.VirtualKeyboard 2.3 -import QtQuick.VirtualKeyboard.Styles 2.1 -import QtQuick.VirtualKeyboard.Settings 2.2 -import QtQuick.VirtualKeyboard.Plugins 2.3 -import Qt.labs.folderlistmodel 2.0 +import QtQml +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Styles +import QtQuick.VirtualKeyboard.Settings +import QtQuick.VirtualKeyboard.Plugins +import Qt.labs.folderlistmodel Item { id: keyboard @@ -85,7 +85,7 @@ Item { function initDefaultInputMethod() { try { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; DefaultInputMethod {}', keyboard, "defaultInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; DefaultInputMethod {}', keyboard, "defaultInputMethod") } catch (e) { } return plainInputMethod } @@ -782,7 +782,7 @@ Item { var soundId = Qt.md5(sound) multiSoundEffect = __sounds[soundId] if (!multiSoundEffect) { - multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; MultiSoundEffect {}', soundEffect) + multiSoundEffect = Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard; 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 d5b1fbfe..15c2e315 100644 --- a/src/virtualkeyboard/content/components/KeyboardColumn.qml +++ b/src/virtualkeyboard/content/components/KeyboardColumn.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Layouts /*! \qmltype KeyboardColumn diff --git a/src/virtualkeyboard/content/components/KeyboardLayout.qml b/src/virtualkeyboard/content/components/KeyboardLayout.qml index 5b790dc6..48852daa 100644 --- a/src/virtualkeyboard/content/components/KeyboardLayout.qml +++ b/src/virtualkeyboard/content/components/KeyboardLayout.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard /*! \qmltype KeyboardLayout @@ -45,9 +45,9 @@ import QtQuick.VirtualKeyboard 2.1 Example: \code - import QtQuick 2.0 - import QtQuick.Layouts 1.0 - import QtQuick.VirtualKeyboard 2.1 + import QtQuick + import QtQuick.Layouts + import QtQuick.VirtualKeyboard // file: layouts/en_GB/main.qml diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml index 800667d7..4f1ec04e 100644 --- a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml +++ b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype KeyboardLayoutLoader @@ -47,9 +47,9 @@ import QtQuick 2.0 Example: \code - import QtQuick 2.0 - import QtQuick.Layouts 1.0 - import QtQuick.VirtualKeyboard 2.1 + import QtQuick + import QtQuick.Layouts + import QtQuick.VirtualKeyboard // file: layouts/en_GB/symbols.qml diff --git a/src/virtualkeyboard/content/components/KeyboardRow.qml b/src/virtualkeyboard/content/components/KeyboardRow.qml index 5c9db6b2..d08f8411 100644 --- a/src/virtualkeyboard/content/components/KeyboardRow.qml +++ b/src/virtualkeyboard/content/components/KeyboardRow.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Layouts /*! \qmltype KeyboardRow diff --git a/src/virtualkeyboard/content/components/ModeKey.qml b/src/virtualkeyboard/content/components/ModeKey.qml index 5fd24b41..901b8f1f 100644 --- a/src/virtualkeyboard/content/components/ModeKey.qml +++ b/src/virtualkeyboard/content/components/ModeKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype ModeKey diff --git a/src/virtualkeyboard/content/components/MultiSoundEffect.qml b/src/virtualkeyboard/content/components/MultiSoundEffect.qml index 685a21df..80080682 100644 --- a/src/virtualkeyboard/content/components/MultiSoundEffect.qml +++ b/src/virtualkeyboard/content/components/MultiSoundEffect.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Item { id: multiSoundEffect diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml index 3c14a544..ee664e86 100644 --- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml +++ b/src/virtualkeyboard/content/components/MultitapInputMethod.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard InputMethod { property string multitapSequence diff --git a/src/virtualkeyboard/content/components/NumberKey.qml b/src/virtualkeyboard/content/components/NumberKey.qml index dfe29912..7f23c53d 100644 --- a/src/virtualkeyboard/content/components/NumberKey.qml +++ b/src/virtualkeyboard/content/components/NumberKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype NumberKey diff --git a/src/virtualkeyboard/content/components/PopupList.qml b/src/virtualkeyboard/content/components/PopupList.qml index dcd02ee1..7e923e4c 100644 --- a/src/virtualkeyboard/content/components/PopupList.qml +++ b/src/virtualkeyboard/content/components/PopupList.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard ListView { property int maxVisibleItems: 5 diff --git a/src/virtualkeyboard/content/components/SelectionControl.qml b/src/virtualkeyboard/content/components/SelectionControl.qml index 16961c23..f571d292 100644 --- a/src/virtualkeyboard/content/components/SelectionControl.qml +++ b/src/virtualkeyboard/content/components/SelectionControl.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard Item { id: root diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/virtualkeyboard/content/components/ShadowInputControl.qml index e3cde2e1..1667f24a 100644 --- a/src/virtualkeyboard/content/components/ShadowInputControl.qml +++ b/src/virtualkeyboard/content/components/ShadowInputControl.qml @@ -27,11 +27,11 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6. -import QtQml 2.14 -import QtQuick.VirtualKeyboard 2.2 -import QtQuick.VirtualKeyboard.Settings 2.2 +import QtQml +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Settings Item { id: control diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml index d31a601a..13e58984 100644 --- a/src/virtualkeyboard/content/components/ShiftKey.qml +++ b/src/virtualkeyboard/content/components/ShiftKey.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard /*! \qmltype ShiftKey diff --git a/src/virtualkeyboard/content/components/SpaceKey.qml b/src/virtualkeyboard/content/components/SpaceKey.qml index 5bfd25a8..6ed5243a 100644 --- a/src/virtualkeyboard/content/components/SpaceKey.qml +++ b/src/virtualkeyboard/content/components/SpaceKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype SpaceKey diff --git a/src/virtualkeyboard/content/components/SymbolModeKey.qml b/src/virtualkeyboard/content/components/SymbolModeKey.qml index 5129c390..2b72761e 100644 --- a/src/virtualkeyboard/content/components/SymbolModeKey.qml +++ b/src/virtualkeyboard/content/components/SymbolModeKey.qml @@ -27,7 +27,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick /*! \qmltype SymbolModeKey diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml index 40cb16f8..9e7d86d8 100644 --- a/src/virtualkeyboard/content/components/TraceInputArea.qml +++ b/src/virtualkeyboard/content/components/TraceInputArea.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.2 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Window +import QtQuick.VirtualKeyboard /*! \qmltype TraceInputArea diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml index dfd58ac9..7f046f1d 100644 --- a/src/virtualkeyboard/content/components/TraceInputKey.qml +++ b/src/virtualkeyboard/content/components/TraceInputKey.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Layouts /*! \qmltype TraceInputKey diff --git a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml index 5790bc74..3d07b5b1 100644 --- a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml +++ b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6. -import QtQml 2.14 -import QtQuick.VirtualKeyboard 2.3 +import QtQml +import QtQuick.VirtualKeyboard PopupList { id: wordCandidatePopupList diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml index 6d7047f4..63485e3d 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml b/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml index f82e4b6c..d91228d8 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Arabic diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml index a7f0e5b9..d749cbbc 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { inputMode: InputEngine.InputMode.Arabic diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml index fe709489..5c94df43 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml index 2da52923..26c7e8eb 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml b/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml index 16f078cb..2511d76e 100644 --- a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/bg_BG/main.qml b/src/virtualkeyboard/content/layouts/bg_BG/main.qml index 2e958aa8..b0a044ba 100644 --- a/src/virtualkeyboard/content/layouts/bg_BG/main.qml +++ b/src/virtualkeyboard/content/layouts/bg_BG/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml b/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml index caf820ae..93b715c1 100644 --- a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml b/src/virtualkeyboard/content/layouts/cs_CZ/main.qml index 4d328bff..17df270c 100644 --- a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml +++ b/src/virtualkeyboard/content/layouts/cs_CZ/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/virtualkeyboard/content/layouts/da_DK/main.qml index b03860e6..941b066d 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/main.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/virtualkeyboard/content/layouts/de_DE/main.qml index bd91ec50..ba82125d 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/main.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml b/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml index b010ecf4..e36aa752 100644 --- a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/el_GR/main.qml b/src/virtualkeyboard/content/layouts/el_GR/main.qml index d9fbaf9e..58a4f648 100644 --- a/src/virtualkeyboard/content/layouts/el_GR/main.qml +++ b/src/virtualkeyboard/content/layouts/el_GR/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml index d4896408..b82a069a 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/virtualkeyboard/content/layouts/es_ES/main.qml index b98980bb..7d90ef9c 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/main.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml index 17bd3c36..613e36f0 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml b/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml index d4896408..b82a069a 100644 --- a/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/es_MX/main.qml b/src/virtualkeyboard/content/layouts/es_MX/main.qml index b98980bb..7d90ef9c 100644 --- a/src/virtualkeyboard/content/layouts/es_MX/main.qml +++ b/src/virtualkeyboard/content/layouts/es_MX/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/es_MX/symbols.qml b/src/virtualkeyboard/content/layouts/es_MX/symbols.qml index 17bd3c36..613e36f0 100644 --- a/src/virtualkeyboard/content/layouts/es_MX/symbols.qml +++ b/src/virtualkeyboard/content/layouts/es_MX/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/et_EE/main.qml b/src/virtualkeyboard/content/layouts/et_EE/main.qml index 4d62e93e..8da105e0 100644 --- a/src/virtualkeyboard/content/layouts/et_EE/main.qml +++ b/src/virtualkeyboard/content/layouts/et_EE/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml index ed92201f..f136a8dc 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml b/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml index 1a43b05e..2d982e68 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Arabic diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml index 0450c772..6ec02a8c 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { inputMode: InputEngine.InputMode.Arabic diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml index e32a1e71..cf3301bd 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml index 8641fdb7..0feb9b21 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fallback/dialpad.qml b/src/virtualkeyboard/content/layouts/fallback/dialpad.qml index 89f6873a..6f576bc1 100644 --- a/src/virtualkeyboard/content/layouts/fallback/dialpad.qml +++ b/src/virtualkeyboard/content/layouts/fallback/dialpad.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fallback/digits.qml b/src/virtualkeyboard/content/layouts/fallback/digits.qml index 432984a1..5c1bd15a 100644 --- a/src/virtualkeyboard/content/layouts/fallback/digits.qml +++ b/src/virtualkeyboard/content/layouts/fallback/digits.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fallback/handwriting.qml b/src/virtualkeyboard/content/layouts/fallback/handwriting.qml index 1da3fc8e..e7301be4 100644 --- a/src/virtualkeyboard/content/layouts/fallback/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/fallback/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/fallback/main.qml b/src/virtualkeyboard/content/layouts/fallback/main.qml index c9a736f2..6ffecc63 100644 --- a/src/virtualkeyboard/content/layouts/fallback/main.qml +++ b/src/virtualkeyboard/content/layouts/fallback/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/fallback/numbers.qml b/src/virtualkeyboard/content/layouts/fallback/numbers.qml index 7fd0a2ab..c6d237f8 100644 --- a/src/virtualkeyboard/content/layouts/fallback/numbers.qml +++ b/src/virtualkeyboard/content/layouts/fallback/numbers.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Plugins 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Plugins KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fallback/symbols.qml b/src/virtualkeyboard/content/layouts/fallback/symbols.qml index 26d62951..32e9afe0 100644 --- a/src/virtualkeyboard/content/layouts/fallback/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fallback/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/virtualkeyboard/content/layouts/fi_FI/main.qml index a3a8a86f..c6cd4eae 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/fr_CA/main.qml b/src/virtualkeyboard/content/layouts/fr_CA/main.qml index 8866dfd7..a4883d8d 100644 --- a/src/virtualkeyboard/content/layouts/fr_CA/main.qml +++ b/src/virtualkeyboard/content/layouts/fr_CA/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/virtualkeyboard/content/layouts/fr_FR/main.qml index 753d8e67..9d110541 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml b/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml index 66914c71..cdcfef26 100644 --- a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/he_IL/main.qml b/src/virtualkeyboard/content/layouts/he_IL/main.qml index 4c47fc56..a81f9537 100644 --- a/src/virtualkeyboard/content/layouts/he_IL/main.qml +++ b/src/virtualkeyboard/content/layouts/he_IL/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml b/src/virtualkeyboard/content/layouts/he_IL/symbols.qml index f4e58652..b8142d39 100644 --- a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml +++ b/src/virtualkeyboard/content/layouts/he_IL/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml b/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml index 1ae1fa4f..77002c1b 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml index aac186eb..867fc319 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml index 6ae785f9..fcbba399 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml b/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml index 968bae8e..d71ec50c 100644 --- a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/hr_HR/main.qml b/src/virtualkeyboard/content/layouts/hr_HR/main.qml index 4b4c46d9..e5b1ffc4 100644 --- a/src/virtualkeyboard/content/layouts/hr_HR/main.qml +++ b/src/virtualkeyboard/content/layouts/hr_HR/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml b/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml index caf820ae..93b715c1 100644 --- a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/hu_HU/main.qml b/src/virtualkeyboard/content/layouts/hu_HU/main.qml index 0834dc04..43bcc362 100644 --- a/src/virtualkeyboard/content/layouts/hu_HU/main.qml +++ b/src/virtualkeyboard/content/layouts/hu_HU/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/virtualkeyboard/content/layouts/it_IT/main.qml index 72d7c03c..fd90880c 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/main.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml b/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml index 08a74384..65fde31b 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] KeyboardRow { diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml index d3fb6ae1..9b6f5fb6 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml @@ -27,12 +27,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sharedLayouts: ['symbols'] sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.FullwidthLatin ? page2 : page1 diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml index 66a4985b..5c008f10 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml b/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml index 563239a4..f25c1664 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: preferredInputMode() diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml index 54e6ec57..262dcbc2 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/main.qml @@ -27,12 +27,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HangulInputMethod {}', parent, "hangulInputMethod") } sourceComponent: InputContext.shiftActive ? 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 352a69e1..552fa02d 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HangulInputMethod {}', parent, "hangulInputMethod") } sharedLayouts: ['main'] property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml index 8580045b..24a17736 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/virtualkeyboard/content/layouts/pl_PL/main.qml index 2a7ebfd0..08260a2a 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/pt_BR/main.qml b/src/virtualkeyboard/content/layouts/pt_BR/main.qml index 53ed462f..e56957f2 100644 --- a/src/virtualkeyboard/content/layouts/pt_BR/main.qml +++ b/src/virtualkeyboard/content/layouts/pt_BR/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/virtualkeyboard/content/layouts/pt_PT/main.qml index 53ed462f..e56957f2 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml index 1d5dedb9..021c4f08 100644 --- a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/ro_RO/main.qml b/src/virtualkeyboard/content/layouts/ro_RO/main.qml index ea3865eb..e329ef87 100644 --- a/src/virtualkeyboard/content/layouts/ro_RO/main.qml +++ b/src/virtualkeyboard/content/layouts/ro_RO/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/virtualkeyboard/content/layouts/ru_RU/main.qml index 87eb2382..3864e838 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/sk_SK/main.qml b/src/virtualkeyboard/content/layouts/sk_SK/main.qml index 1f739d31..45889ced 100644 --- a/src/virtualkeyboard/content/layouts/sk_SK/main.qml +++ b/src/virtualkeyboard/content/layouts/sk_SK/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/sl_SI/main.qml b/src/virtualkeyboard/content/layouts/sl_SI/main.qml index 76293626..34f02cbc 100644 --- a/src/virtualkeyboard/content/layouts/sl_SI/main.qml +++ b/src/virtualkeyboard/content/layouts/sl_SI/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/sq_AL/main.qml b/src/virtualkeyboard/content/layouts/sq_AL/main.qml index 4b50e883..e36cca04 100644 --- a/src/virtualkeyboard/content/layouts/sq_AL/main.qml +++ b/src/virtualkeyboard/content/layouts/sq_AL/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml b/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml index 6f9cbb98..2c55d308 100644 --- a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/sr_SP/main.qml b/src/virtualkeyboard/content/layouts/sr_SP/main.qml index acd381ae..9f822b7c 100644 --- a/src/virtualkeyboard/content/layouts/sr_SP/main.qml +++ b/src/virtualkeyboard/content/layouts/sr_SP/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/virtualkeyboard/content/layouts/sv_SE/main.qml index a3a8a86f..c6cd4eae 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/th_TH/handwriting.qml b/src/virtualkeyboard/content/layouts/th_TH/handwriting.qml index 428f29fa..2b6674b9 100644 --- a/src/virtualkeyboard/content/layouts/th_TH/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/th_TH/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/th_TH/main.qml b/src/virtualkeyboard/content/layouts/th_TH/main.qml index 60a8ebc0..de660ef4 100644 --- a/src/virtualkeyboard/content/layouts/th_TH/main.qml +++ b/src/virtualkeyboard/content/layouts/th_TH/main.qml @@ -27,14 +27,14 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { inputMode: InputEngine.InputMode.Latin function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; ThaiInputMethod {}', parent, "thaiInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; ThaiInputMethod {}', parent, "thaiInputMethod") } sharedLayouts: [ "symbols" ] sourceComponent: InputContext.shiftActive ? page2 : page1 diff --git a/src/virtualkeyboard/content/layouts/th_TH/symbols.qml b/src/virtualkeyboard/content/layouts/th_TH/symbols.qml index 53fdcd6e..8c0a48a6 100644 --- a/src/virtualkeyboard/content/layouts/th_TH/symbols.qml +++ b/src/virtualkeyboard/content/layouts/th_TH/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/tr_TR/main.qml b/src/virtualkeyboard/content/layouts/tr_TR/main.qml index 31bf0dc1..63d653ab 100644 --- a/src/virtualkeyboard/content/layouts/tr_TR/main.qml +++ b/src/virtualkeyboard/content/layouts/tr_TR/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/uk_UA/main.qml b/src/virtualkeyboard/content/layouts/uk_UA/main.qml index c2731452..9983a69f 100644 --- a/src/virtualkeyboard/content/layouts/uk_UA/main.qml +++ b/src/virtualkeyboard/content/layouts/uk_UA/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/vi_VN/main.qml b/src/virtualkeyboard/content/layouts/vi_VN/main.qml index 9a5c7e37..6e960ced 100644 --- a/src/virtualkeyboard/content/layouts/vi_VN/main.qml +++ b/src/virtualkeyboard/content/layouts/vi_VN/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { inputMode: InputEngine.InputMode.Latin diff --git a/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml b/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml index da5281b3..82cfc37c 100644 --- a/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml b/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml index fee04320..9ffe445b 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: preferredInputMode() diff --git a/src/virtualkeyboard/content/layouts/zh_CN/main.qml b/src/virtualkeyboard/content/layouts/zh_CN/main.qml index 349a14c8..90ff4c83 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/main.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; 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 4ad06baf..9f4a9ee0 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; PinyinInputMethod {}', parent, "pinyinInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml b/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml index fee04320..9ffe445b 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: preferredInputMode() diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml index bd9c1451..fe325505 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; TCInputMethod {}', parent, "tcInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; TCInputMethod {}', parent, "tcInputMethod") } sharedLayouts: ['symbols'] sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cangjie ? pageCangjie : pageZhuyin diff --git a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml index 3d43ae69..daf059bc 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml @@ -27,13 +27,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.Layouts +import QtQuick.VirtualKeyboard KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; TCInputMethod {}', parent, "tcInputMethod") + return Qt.createQmlObject('import QtQuick; import QtQuick.VirtualKeyboard.Plugins; TCInputMethod {}', parent, "tcInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index 095d5fc4..0808591e 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Styles 2.1 +import QtQuick +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Styles KeyboardStyle { id: currentStyle diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index 17d2581e..a83285b7 100644 --- a/src/virtualkeyboard/content/styles/retro/style.qml +++ b/src/virtualkeyboard/content/styles/retro/style.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Styles 2.1 +import QtQuick +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Styles KeyboardStyle { id: currentStyle diff --git a/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml b/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml index 4f5b1f08..0bcd71ef 100644 --- a/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml +++ b/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 1.0 +import QtQuick +import QtQuick.VirtualKeyboard // file: CustomInputMethod.qml diff --git a/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml b/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml index f3dc4ace..c2cc23e0 100644 --- a/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtTest 1.0 -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtTest +import QtQuick +import QtQuick.VirtualKeyboard import "handwriting.js" as Handwriting import "utils.js" as Utils diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml index dd46a5b9..4d40840b 100644 --- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtTest 1.0 -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.3 -import QtQuick.VirtualKeyboard.Settings 2.2 +import QtTest +import QtQuick +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Settings import "handwriting.js" as Handwriting import "utils.js" as Utils diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index ec1dbd97..f45efeea 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtTest 1.0 -import QtQuick 2.0 -import QtQuick.Window 2.3 +import QtTest +import QtQuick +import QtQuick.Window Rectangle { id: container @@ -145,65 +145,65 @@ Rectangle { function test_versionCheck_data() { return [ // Note: Add new import versions here - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard 1.0; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ Item {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard 1.1; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ Item {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard 1.2; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ Item {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard 1.3; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ Item {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard 2.0; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ Item {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard 2.1; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ Item {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Styles 1.0; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Styles; \ KeyboardStyle {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Styles 1.1; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Styles; \ KeyboardStyle {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Styles 1.2; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Styles; \ KeyboardStyle {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Styles 1.3; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Styles; \ KeyboardStyle {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Styles 2.0; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Styles; \ KeyboardStyle {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Styles 2.1; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Styles; \ KeyboardStyle {}" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Settings 1.0; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Settings; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Settings 1.1; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Settings; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Settings 1.2; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Settings; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Settings 2.0; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Settings; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ property var activeLocales: VirtualKeyboardSettings.activeLocales }" }, - { qml: "import QtQuick 2.0; \ - import QtQuick.VirtualKeyboard.Settings 2.1; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Settings; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ property var activeLocales: VirtualKeyboardSettings.activeLocales }" }, - { qml: "import QtQuick 2.7; \ - import QtQuick.VirtualKeyboard.Settings 2.2; \ + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard.Settings; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ diff --git a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml index e58b8d66..184cf497 100644 --- a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml +++ b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { objectName: "en_GB" diff --git a/tests/auto/layoutresources/data/layouts/en_GB/main.qml b/tests/auto/layoutresources/data/layouts/en_GB/main.qml index e58b8d66..184cf497 100644 --- a/tests/auto/layoutresources/data/layouts/en_GB/main.qml +++ b/tests/auto/layoutresources/data/layouts/en_GB/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick +import QtQuick.VirtualKeyboard KeyboardLayout { objectName: "en_GB" diff --git a/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml b/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml index efb8e3bd..352a0f56 100644 --- a/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml +++ b/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Styles 2.1 +import QtQuick +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Styles KeyboardStyle { diff --git a/tests/auto/styles/data/tst_styles.qml b/tests/auto/styles/data/tst_styles.qml index 0b4d3b37..6a2b4e91 100644 --- a/tests/auto/styles/data/tst_styles.qml +++ b/tests/auto/styles/data/tst_styles.qml @@ -27,9 +27,9 @@ ** ****************************************************************************/ -import QtTest 1.0 -import QtQuick 2.0 -import QtQuick.VirtualKeyboard.Settings 2.0 +import QtTest +import QtQuick +import QtQuick.VirtualKeyboard.Settings Item { diff --git a/tests/manual/quickcontrols2/main.qml b/tests/manual/quickcontrols2/main.qml index cfd4c0f5..7178638f 100644 --- a/tests/manual/quickcontrols2/main.qml +++ b/tests/manual/quickcontrols2/main.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.VirtualKeyboard 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.VirtualKeyboard ApplicationWindow { visible: true diff --git a/tests/manual/x11vkbwrapper/Keyboard.qml b/tests/manual/x11vkbwrapper/Keyboard.qml index 152bdb98..3ab1bd64 100644 --- a/tests/manual/x11vkbwrapper/Keyboard.qml +++ b/tests/manual/x11vkbwrapper/Keyboard.qml @@ -27,10 +27,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.VirtualKeyboard 2.2 -import Qt.labs.platform 1.1 +import QtQuick +import QtQuick.Window +import QtQuick.VirtualKeyboard +import Qt.labs.platform Window { id: keyboardWindow diff --git a/tests/manual/x11vkbwrapper/main.qml b/tests/manual/x11vkbwrapper/main.qml index b5a0221f..f2ba35cd 100644 --- a/tests/manual/x11vkbwrapper/main.qml +++ b/tests/manual/x11vkbwrapper/main.qml @@ -27,8 +27,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Window Window { id: window |