Fixed qml warnings after migrate to qt 5.15

musescore · Oct 9, 2020 · 72ca0c3 · 72ca0c3
1 parent c183ab2
commit 72ca0c3
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 43 deletions.
diff --git a/framework/ui/qml/MuseScore/Ui/InteractiveProvider.qml b/framework/ui/qml/MuseScore/Ui/InteractiveProvider.qml
@@ -21,7 +21,7 @@ Item {
     Connections {
         target: root.provider
 
-        onFireOpen: {
+        function onFireOpen(data) {
 
             var page = data.data()
             console.log("try open uri: " + data.value("uri") + ", page: " + JSON.stringify(page))

diff --git a/framework/uicomponents/qml/MuseScore/UiComponents/SeparatorLine.qml b/framework/uicomponents/qml/MuseScore/UiComponents/SeparatorLine.qml
@@ -1,4 +1,6 @@
-import QtQuick 2.0
+import QtQuick 2.9
+import QtQuick.Layouts 1.3
+
 import MuseScore.Ui 1.0
 
 Rectangle {
@@ -13,31 +15,21 @@ Rectangle {
             name: "HORIZONTAL"
             when: orientation == Qt.Horizontal
 
-            AnchorChanges {
-                target: root
-                anchors.left: parent.left
-                anchors.right: parent.right
-            }
-
             PropertyChanges {
                 target: root
                 height: 1
+                Layout.fillWidth: true
             }
         },
 
         State {
             name: "VERTICAL"
             when: orientation == Qt.Vertical
 
-            AnchorChanges {
-                target: root
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-            }
-
             PropertyChanges {
                 target: root
                 width: 1
+                Layout.fillHeight: true
             }
         }
     ]

diff --git a/framework/uicomponents/qml/MuseScore/UiComponents/TabPanel.qml b/framework/uicomponents/qml/MuseScore/UiComponents/TabPanel.qml
@@ -23,7 +23,7 @@ TabView {
         Connections {
             target: root
 
-            onCurrentIndexChanged: {
+            function onCurrentIndexChanged(currentIndex) {
                 if (currentIndex < 0)
                     return
 

diff --git a/mu4/appshell/qml/DevTools/Audio/SynthSettings.qml b/mu4/appshell/qml/DevTools/Audio/SynthSettings.qml
@@ -98,14 +98,14 @@ Rectangle {
 
             Connections {
                 target: settingsModel
-                onSelectedChanged: {
+                function onSelectedChanged(name) {
                     if (name === "Zerberus") {
                         zerberusPanel.selectedSoundFonts = []
                         zerberusPanel.selectedSoundFonts = settingsModel.selectedSoundFonts("Zerberus")
                     }
                 }
 
-                onAvalaibleChanged: {
+                function onAvalaibleChanged(name) {
                     if (name === "Zerberus") {
                         zerberusPanel.avalaibleSoundFonts = []
                         zerberusPanel.avalaibleSoundFonts = settingsModel.avalaibleSoundFonts("Zerberus")

diff --git a/mu4/appshell/qml/Settings/SettingsPage.qml b/mu4/appshell/qml/Settings/SettingsPage.qml
@@ -84,7 +84,9 @@ DockPage {
 
                         Connections {
                             target: loader.item
-                            onChanged: settingsModel.changeVal(model.index, newVal)
+                            function onChanged(newVal) {
+                                settingsModel.changeVal(model.index, newVal)
+                            }
                         }
                     }
                 }

diff --git a/mu4/instruments/qml/MuseScore/Instruments/ChooseInstrumentsPage.qml b/mu4/instruments/qml/MuseScore/Instruments/ChooseInstrumentsPage.qml
@@ -50,7 +50,7 @@ Rectangle {
             Connections {
                 target: instrumentsModel
 
-                onSelectedFamilyChanged: {
+                function onSelectedFamilyChanged(family) {
                     familyView.setFamily(family)
                 }
             }
@@ -111,7 +111,7 @@ Rectangle {
 
         Column {
             Layout.preferredWidth: 30
-            anchors.verticalCenter: parent.verticalCenter
+            Layout.alignment: Qt.AlignVCenter
 
             spacing: 12
 

diff --git a/mu4/instruments/qml/MuseScore/Instruments/InstrumentsView.qml b/mu4/instruments/qml/MuseScore/Instruments/InstrumentsView.qml
@@ -159,7 +159,7 @@ Item {
 
             Connections {
                 target: privateProperties
-                onCurrentInstrumentIndexChanged: {
+                function onCurrentInstrumentIndexChanged() {
                     if (privateProperties.currentInstrumentIndex == index) {
                         item.resetCurrentInstrument()
                     }

diff --git a/mu4/languages/qml/MuseScore/Languages/LanguagesPage.qml b/mu4/languages/qml/MuseScore/Languages/LanguagesPage.qml
@@ -176,10 +176,10 @@ Item {
 
             Connections {
                 target: languageListModel
-                onProgress: {
+                function onProgress(status, indeterminate, current, total) {
                     languageInfo.setProgress(status, indeterminate, current, total)
                 }
-                onFinish: {
+                function onFinish() {
                     languageInfo.resetProgress()
                 }
             }

diff --git a/mu4/userscores/qml/MuseScore/UserScores/NewScoreDialog.qml b/mu4/userscores/qml/MuseScore/UserScores/NewScoreDialog.qml
@@ -34,14 +34,10 @@ QmlDialog {
 
             ChooseInstrumentsAndTemplatesPage {
                 id: instrumentsAndTemplatePage
-
-                anchors.fill: parent
             }
 
             ScoreInfoPage {
                 id: scoreInfoPage
-
-                anchors.fill: parent
             }
         }
 

diff --git a/mu4/userscores/qml/MuseScore/UserScores/internal/ChooseInstrumentsAndTemplatesPage.qml b/mu4/userscores/qml/MuseScore/UserScores/internal/ChooseInstrumentsAndTemplatesPage.qml
@@ -56,14 +56,10 @@ Item {
 
         ChooseInstrumentsPage {
             id: instrumentsPage
-
-            anchors.fill: parent
         }
 
         ChooseTemplatePage {
             id: templatePage
-
-            anchors.fill: parent
         }
     }
 }
diff --git a/mu4/userscores/qml/MuseScore/UserScores/internal/KeySignatureListView.qml b/mu4/userscores/qml/MuseScore/UserScores/internal/KeySignatureListView.qml
@@ -9,9 +9,6 @@ GridView {
 
     property var currentSignature: null
 
-    anchors.left: parent.left
-    anchors.right: parent.right
-
     height: contentHeight
 
     clip: true

diff --git a/mu4/userscores/qml/MuseScore/UserScores/internal/KeySignatureSettings.qml b/mu4/userscores/qml/MuseScore/UserScores/internal/KeySignatureSettings.qml
@@ -51,7 +51,7 @@ FlatButton {
     StyledPopup {
         id: popup
 
-        implicitHeight: column.implicitHeight + topPadding + bottomPadding + 40
+        implicitHeight: 300
         implicitWidth: 724
 
         arrowX: root.arrowX
@@ -95,8 +95,6 @@ FlatButton {
                 anchors.left: parent.left
                 anchors.right: parent.right
 
-                height: childrenRect.height
-
                 currentIndex: bar.currentIndex
 
                 KeySignatureListView {

diff --git a/mu4/userscores/qml/MuseScore/UserScores/internal/ScoreInfoPage.qml b/mu4/userscores/qml/MuseScore/UserScores/internal/ScoreInfoPage.qml
@@ -52,19 +52,16 @@ Item {
         AdditionalInfoView {
             id: additionalInfo
 
-            anchors.left: parent.left
-            anchors.right: parent.right
-
             Layout.preferredHeight: 150
+            Layout.fillWidth: true
         }
 
         SeparatorLine { }
 
         GeneralInfoView {
             id: generalInfo
 
-            anchors.left: parent.left
-            anchors.right: parent.right
+            Layout.fillWidth: true
         }
     }
 }
diff --git a/mu4/userscores/qml/MuseScore/UserScores/internal/TimeSignatureSettings.qml b/mu4/userscores/qml/MuseScore/UserScores/internal/TimeSignatureSettings.qml
@@ -28,7 +28,7 @@ FlatButton {
         Connections {
             target: model
 
-            onTimeSignatureChanged: {
+            function onTimeSignatureChanged(timeSignature) {
                 timeSignatureView.numerator = model.musicSymbolCodes(timeSignature.numerator)
                 timeSignatureView.denominator = model.musicSymbolCodes(timeSignature.denominator)
             }