Introduce upgrade-qml-imports.sh bash script

It help upgrading and/or maintaining correct Qml import modules version.
Signed-off-by: Linus Jahn <lnj@kaidan.im>

src/qml/AboutDialog.qml

@@ -28,10 +28,10 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.1 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick 2.7
+import QtQuick.Layouts 1.3
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 
 Controls.Dialog {
 	id: aboutDialog

src/qml/ChatPage.qml

@@ -28,12 +28,12 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.0 as Controls
-import QtMultimedia 5.10 as Multimedia
-import org.kde.kirigami 2.2 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import QtMultimedia 5.8 as Multimedia
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import EmojiModel 0.1

src/qml/EmptyChatPage.qml

@@ -28,8 +28,8 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick.Controls 2.0 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 import QtQuick 2.7
 
 Kirigami.Page {

src/qml/GlobalDrawer.qml

@@ -28,7 +28,7 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import im.kaidan.kaidan 1.0
 import "settings"
 

src/qml/LoginPage.qml

@@ -29,10 +29,10 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.0 as Controls
-import QtQuick.Controls.Material 2.0
-import QtQuick.Layouts 1.2
-import org.kde.kirigami 2.5 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import QtQuick.Controls.Material 2.3
+import QtQuick.Layouts 1.3
+import org.kde.kirigami 2.8 as Kirigami
 import im.kaidan.kaidan 1.0
 
 Kirigami.Page {

src/qml/MultimediaSettingsPage.qml

@@ -28,11 +28,11 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.4 as Controls
-import QtMultimedia 5.10 as Multimedia
-import org.kde.kirigami 2.2 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import QtMultimedia 5.8 as Multimedia
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/QrCodeScannerPage.qml

@@ -28,10 +28,10 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.7
 import QtQuick.Controls 2.3 as Controls
-import QtMultimedia 5.9
-import org.kde.kirigami 2.4 as Kirigami
+import QtMultimedia 5.8
+import org.kde.kirigami 2.8 as Kirigami
 import im.kaidan.kaidan 1.0
 
 // QR code scanner output and decoding for logging in by a decoded XMPP URI

src/qml/UserProfilePage.qml

@@ -28,11 +28,11 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
-import QtQuick.Controls 2.4 as Controls
+import QtQuick 2.7
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
 import QtQml 2.2
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import "elements"

src/qml/elements/Avatar.qml

@@ -29,9 +29,9 @@
  */
 
 
-import QtQuick 2.0
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 Item {
     id: avatar

src/qml/elements/ChatMessage.qml

@@ -28,11 +28,11 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtGraphicalEffects 1.0
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/EmojiPicker.qml

@@ -28,11 +28,11 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick 2.7
+import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import EmojiModel 0.1
 
 Popup {

src/qml/elements/FileChooser.qml

@@ -28,8 +28,8 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick 2.7
+import org.kde.kirigami 2.8 as Kirigami
 
 Item {
 	id: root

src/qml/elements/FileChooserDesktop.qml

@@ -28,8 +28,8 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
-import QtQuick.Dialogs 1.2
+import QtQuick 2.7
+import QtQuick.Dialogs 1.3
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/FileChooserMobile.qml

@@ -29,8 +29,8 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Layouts 1.1
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Layouts 1.3
+import org.kde.kirigami 2.8 as Kirigami
 import Qt.labs.folderlistmodel 2.1
 
 Item {

src/qml/elements/IconButton.qml

@@ -28,8 +28,8 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import org.kde.kirigami 2.0 as Kirigami
-import QtQuick.Controls 2.0 as Controls
+import org.kde.kirigami 2.8 as Kirigami
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
 
 Controls.ToolButton {

src/qml/elements/MediaPreview.qml

@@ -33,10 +33,10 @@
  * the user. It shows the file name, file size and a little file icon.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 

src/qml/elements/MediaPreviewAudio.qml

@@ -33,13 +33,11 @@
  * the user. It just displays the audio in a rectangle.
  */
 
-import QtQuick 2.6
-
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import QtMultimedia 5.9 as Multimedia
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import QtMultimedia 5.8 as Multimedia
+import org.kde.kirigami 2.8 as Kirigami
 
 import MediaUtils 0.1
 

src/qml/elements/MediaPreviewImage.qml

@@ -33,10 +33,10 @@
  * the user. It just displays the image in a rectangle.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 
 MediaPreview {
 	id: root

src/qml/elements/MediaPreviewLoader.qml

@@ -28,10 +28,10 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import QtPositioning 5.9 as Positioning
+import QtQuick.Controls 2.3 as Controls
+import QtPositioning 5.2 as Positioning
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/MediaPreviewLocation.qml

@@ -33,10 +33,10 @@
  * the user. It just displays the map in a rectangle.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtLocation 5.9 as Location
-import org.kde.kirigami 2.0 as Kirigami
+import QtLocation 5.3 as Location
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/MediaPreviewOther.qml

@@ -33,11 +33,11 @@
  * the user. It shows the file name, file size and a little file icon.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.0 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/MediaPreviewVideo.qml

@@ -33,10 +33,10 @@
  * the user. It just displays the video in a rectangle.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtMultimedia 5.9 as Multimedia
-import org.kde.kirigami 2.0 as Kirigami
+import QtMultimedia 5.8 as Multimedia
+import org.kde.kirigami 2.8 as Kirigami
 
 MediaPreviewAudio {
 	id: root

src/qml/elements/MessageCounter.qml

@@ -28,7 +28,7 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.7
 
 Rectangle {
 	property int counter: 0

src/qml/elements/NewMedia.qml

@@ -35,9 +35,9 @@
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.4 as Controls
-import QtMultimedia 5.10 as Multimedia
-import org.kde.kirigami 2.2 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import QtMultimedia 5.8 as Multimedia
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/NewMediaLoader.qml

@@ -28,10 +28,10 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import QtPositioning 5.9 as Positioning
+import QtQuick.Controls 2.3 as Controls
+import QtPositioning 5.2 as Positioning
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/NewMediaLocation.qml

@@ -33,12 +33,12 @@
  * the user. It just displays the map in a rectangle.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import QtPositioning 5.9 as Positioning
-import QtLocation 5.9 as Location
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import QtPositioning 5.2 as Positioning
+import QtLocation 5.3 as Location
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/RosterAddContactSheet.qml

@@ -29,9 +29,9 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 Kirigami.OverlaySheet {
 	property string jid: ""

src/qml/elements/RosterListItem.qml

@@ -28,11 +28,11 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Controls 2.3 as Controls
 import QtGraphicalEffects 1.0
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import im.kaidan.kaidan 1.0
 
 Kirigami.SwipeListItem {

src/qml/elements/RosterRemoveContactSheet.qml

@@ -28,10 +28,10 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
-import QtQuick.Controls 2.0 as Controls
+import QtQuick 2.7
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 Kirigami.OverlaySheet {
 	property string jid

src/qml/elements/RosterRenameContactSheet.qml

@@ -29,9 +29,9 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 Kirigami.OverlaySheet {
 	property string jid

src/qml/elements/RoundImage.qml

@@ -28,7 +28,7 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtGraphicalEffects 1.0
 
 Image {

src/qml/elements/SendMediaSheet.qml

@@ -28,10 +28,10 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.6
+import QtQuick 2.7
 import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0 as Controls
-import org.kde.kirigami 2.0 as Kirigami
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.8 as Kirigami
 
 import im.kaidan.kaidan 1.0
 import MediaUtils 0.1

src/qml/elements/SubRequestAcceptSheet.qml

@@ -29,9 +29,9 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.1 as Controls
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 Kirigami.OverlaySheet {
 	property string from;

src/qml/elements/TextAvatar.qml

@@ -28,9 +28,9 @@
  *  along with Kaidan.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import org.kde.kirigami 2.2 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import QtQuick 2.7
-import QtQuick.Layouts 1.2
+import QtQuick.Layouts 1.3
 
 Rectangle {
 	id: avatar

src/qml/main.qml

@@ -29,8 +29,8 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls.Material 2.0
-import org.kde.kirigami 2.3 as Kirigami
+import QtQuick.Controls.Material 2.3
+import org.kde.kirigami 2.8 as Kirigami
 import StatusBar 0.1
 import im.kaidan.kaidan 1.0
 import "elements"

src/qml/settings/ChangePassword.qml

@@ -31,7 +31,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.4 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import im.kaidan.kaidan 1.0
 
 Kirigami.Page {

src/qml/settings/SettingsItem.qml

@@ -29,9 +29,9 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 Kirigami.BasicListItem {
 	property string name

src/qml/settings/SettingsPage.qml

@@ -31,7 +31,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 import im.kaidan.kaidan 1.0
 
 /**

src/qml/settings/SettingsSheet.qml

@@ -29,9 +29,9 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Controls 2.3 as Controls
 import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.8 as Kirigami
 
 /**
  * This sheet is used on desktop systems instead of a new layer. It doesn't

utils/upgrade-qml-imports.sh

+#!/bin/bash
+
+SCRIPT_DIR=$(dirname "${0}")
+
+if [ "${SCRIPT_DIR:0:1}" != "/" ]; then
+    SCRIPT_DIR=${PWD}/${SCRIPT_DIR}
+fi
+
+SOURCE_DIR="${SCRIPT_DIR}/../src"
+
+# Force early exit on issue
+set -e
+# Force debug traces of executed commands
+#set -o xtrace
+
+# find "${SOURCE_DIR}" -iname '*.qml' -exec grep 'import ' {} \; | sort -u
+# import "elements"
+# import EmojiModel 0.1
+# import im.kaidan.kaidan 1.0
+# import MediaUtils 0.1
+# import org.kde.kirigami 2.0 as Kirigami
+# import org.kde.kirigami 2.2 as Kirigami
+# import org.kde.kirigami 2.3 as Kirigami
+# import org.kde.kirigami 2.4 as Kirigami
+# import org.kde.kirigami 2.5 as Kirigami
+# import QtGraphicalEffects 1.0
+# import Qt.labs.folderlistmodel 2.1
+# import QtLocation 5.9 as Location
+# import QtMultimedia 5.10 as Multimedia
+# import QtMultimedia 5.9
+# import QtMultimedia 5.9 as Multimedia
+# import QtPositioning 5.9 as Positioning
+# import QtQml 2.2
+# import QtQuick 2.0
+# import QtQuick 2.3
+# import QtQuick 2.6
+# import QtQuick 2.7
+# import QtQuick 2.9
+# import QtQuick.Controls 2.0 as Controls
+# import QtQuick.Controls 2.1 as Controls
+# import QtQuick.Controls 2.2
+# import QtQuick.Controls 2.2 as Controls
+# import QtQuick.Controls 2.3 as Controls
+# import QtQuick.Controls 2.4 as Controls
+# import QtQuick.Controls.Material 2.0
+# import QtQuick.Dialogs 1.2
+# import QtQuick.Layouts 1.1
+# import QtQuick.Layouts 1.2
+# import QtQuick.Layouts 1.3
+# import "settings"
+# import StatusBar 0.1
+
+declare -A QT # 5.10
+QT["QtGraphicalEffects"]="1.0"
+QT["Qt.labs.folderlistmodel"]="2.1"