remove versions for imports that need qt6 compact

MycroftAI · Feb 7, 2023 · 2db5c83 · 2db5c83
1 parent 5c5f14e
commit 2db5c83
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/import/qml/AudioPlayer.qml b/import/qml/AudioPlayer.qml
@@ -19,10 +19,9 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15
-import QtMultimedia 5.15
 import org.kde.kirigami 2.19 as Kirigami
 import Mycroft 1.0 as Mycroft
-
+import QtMultimedia
 
 Item {
     id: root

diff --git a/import/qml/CardDelegate.qml b/import/qml/CardDelegate.qml
@@ -19,8 +19,8 @@ import QtQuick 2.15
 import QtQuick.Layouts 2.15
 import QtQuick.Controls 2.15 as Controls
 import org.kde.kirigami 2.19 as Kirigami
-import Qt5Compat.GraphicalEffects 1.0
 import Mycroft 1.0 as Mycroft
+import Qt5Compat.GraphicalEffects
 
 Delegate {
     id: root

diff --git a/import/qml/SkillView.qml b/import/qml/SkillView.qml
@@ -18,10 +18,10 @@
 
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
-import Qt5Compat.GraphicalEffects 1.0
 import QtQuick.Controls 2.15 as Controls
 import org.kde.kirigami 2.19 as Kirigami
 import Mycroft 1.0 as Mycroft 
+import Qt5Compat.GraphicalEffects
 
 import "private" as Private
 

diff --git a/import/qml/SoundEffects.qml b/import/qml/SoundEffects.qml
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.15
-import QtMultimedia 5.15
+import QtMultimedia
 
 pragma Singleton
 

diff --git a/import/qml/StatusIndicator.qml b/import/qml/StatusIndicator.qml
@@ -17,9 +17,9 @@
  */
 
 import QtQuick 2.15
-import Qt5Compat.GraphicalEffects 1.0
 import org.kde.kirigami 2.13 as Kirigami
 import Mycroft 1.0 as Mycroft
+import Qt5Compat.GraphicalEffects
 
 Item {
     id: root

diff --git a/import/qml/VideoPlayer.qml b/import/qml/VideoPlayer.qml
@@ -20,9 +20,9 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Templates 2.15 as Templates
 import QtQuick.Layouts 1.15
-import QtMultimedia 5.15
 import org.kde.kirigami 2.19 as Kirigami
 import Mycroft 1.0 as Mycroft
+import QtMultimedia
 
 Item {
     id: root

diff --git a/tests/SkillViewTest.qml b/tests/SkillViewTest.qml
@@ -14,13 +14,11 @@ Window {
     maximumWidth : deviceWidth || undefined
     x: deviceWidth ? Screen.desktopAvailableHeight - width : undefined
     y: deviceHeight ? Screen.desktopAvailableHeight - height : undefined
-
     color: "black"
 
     Mycroft.SkillView {
         id: mainView
         activeSkills.whiteList: singleSkill.length > 0 ? singleSkill : null
-        Kirigami.Theme.colorSet: nightSwitch.checked ? Kirigami.Theme.Complementary : Kirigami.Theme.View
         anchors.fill: parent
     }
 }