src/main.cpp

@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
         qDebug() << "==== NOOTKA LOG =======\n" << QDateTime::currentDateTime().toString();
     }
 #else
-    qputenv("QT_QUICK_CONTROLS_STYLE", ""); // reset style environment var - other styles can cause crashes
+    qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); // reset style environment var - other styles can cause crashes
 #endif
 
     QElapsedTimer startElapsed;

src/qml/MainScore.qml

@@ -170,7 +170,7 @@ Score {
 
     Connections {
         target: SOUND
-        onInitialized: {
+        function onInitialized() : void {
             mainObj.scoreObject = scoreObj;
             singleNote = Qt.binding(function() {
                 return GLOB.singleNoteMode;
@@ -193,12 +193,12 @@ Score {
 
     Connections {
         target: GLOB
-        onClefTypeChanged: score.clef = GLOB.clefType
+        function onClefTypeChanged() : void { score.clef = GLOB.clefType }
     }
 
     Connections {
         target: GLOB.tuning
-        onScordatureChanged: updateScord()
+        function onScordatureChanged() : void { updateScord() }
     }
 
     // note highlight

src/qml/MainWindow.qml

@@ -157,12 +157,10 @@ ApplicationWindow {
             height: parent.height / (GLOB.singleNoteMode && topToBott ? 2 : 1)
             width: parent.width / (GLOB.singleNoteMode && !topToBott ? 2 : 1)
         }
-
     }
 
     Instrument {
         id: instrument
-
         score: score
     }
 

src/qml/instruments/Guitar.qml

@@ -130,7 +130,7 @@ TguitarBg {
     Connections {
         target: instrFlick
         enabled: !NOO.isAndroid()
-        onMovementEnded: instrument.pressedAt(0, 0)
+        function onMovementEnded() : void { instrument.pressedAt(0, 0) }
     }
 
     MouseArea {

src/qml/instruments/Instrument.qml

@@ -52,13 +52,13 @@ Flickable {
 
     Connections {
         target: GLOB
-        onInstrumentChanged: setInstrument()
+        function onInstrumentChanged() : void { setInstrument() }
     }
 
     Connections {
         target: score
         enabled: GLOB.instrument.piano
-        onClefChanged: instrument.setAmbitus(score.scoreObj.lowestNote(), score.scoreObj.highestNote())
+        function onClefChanged() : void { instrument.setAmbitus(score.scoreObj.lowestNote(), score.scoreObj.highestNote()) }
     }
 
 }

src/qml/score/Clef.qml

@@ -91,7 +91,7 @@ Text {
 
     Connections {
         target: score
-        onClefChanged: getPos()
+        function onClefChanged() : void { getPos() }
     }
 
 }

src/qml/score/DelControl.qml

@@ -17,8 +17,8 @@ ControlBase {
     Connections {
         target: scoreObj
         enabled: !scoreObj.singleNote && scoreObj.allowAdding && !scoreObj.readOnly
-        onEditModeChanged: delControl.show = scoreObj.editMode && activeItem
-        onActiveNoteChanged: {
+        function onEditModeChanged() : void { delControl.show = scoreObj.editMode && activeItem }
+        function onActiveNoteChanged() : void {
             if (scoreObj.activeNote) {
                 if (!scoreObj.readOnly && activeItem != scoreObj.activeNote) {
                     activeItem = scoreObj.activeNote;
@@ -30,7 +30,7 @@ ControlBase {
                 delControl.active = false;
             }
         }
-        onScoreWasCleared: show = false
+        function onScoreWasCleared() : void { show = false }
     }
 
     GlowRect {
@@ -94,18 +94,14 @@ ControlBase {
                 Component.onCompleted: {
                     if (scoreObj.deleteNoteAct)
                         statusTip = scoreObj.deleteNoteAct.text + ".<br><b>(" + scoreObj.deleteNoteAct.key() + ")</b>";
-
                 }
 
                 font {
                     family: "Nootka"
                     pixelSize: factor * 3
                 }
-
             }
-
         }
-
     }
 
 }

src/qml/score/Meter.qml

@@ -18,7 +18,7 @@ Text {
 
     Connections {
         target: score
-        onMeterChanged: text = NOO.meter(score.meter).symbol()
+        function onMeterChanged() : void { text = NOO.meter(score.meter).symbol() }
     }
 
     font {

src/qml/score/ScoreToolbox.qml

@@ -55,8 +55,8 @@ ControlBase {
 
     Connections {
         target: scoreObj
-        onScoreWasCleared: show = false
-        onEditModeChanged: show = scoreObj.editMode && scoreObj.activeNote
+        function onScoreWasCleared() : void { show = false }
+        function onEditModeChanged() : void { show = scoreObj.editMode && scoreObj.activeNote }
     }
 
     component: Component {
@@ -86,11 +86,8 @@ ControlBase {
                             family: "scorek"
                             pixelSize: factor * 3
                         }
-
                     }
-
                 }
-
             }
 
             Rectangle {
@@ -116,20 +113,17 @@ ControlBase {
                                 var act = rtmActions[Math.floor(index / 2)];
                                 if (act)
                                     item.statusTip = act.text + "<br><b>(" + act.key() + ")</b>";
-
                             }
                         }
 
                         Connections {
                             target: item
-                            onClicked: {
+                            function onClicked : void {
                                 scoreObj.workRtmValue = item.rhythm;
                                 scoreObj.workRtmRest = item.rest;
                             }
                         }
-
                     }
-
                 }
                 // triplet
 
@@ -165,7 +159,6 @@ ControlBase {
                         item.text = ".";
                         if (scoreObj.dotNoteAct)
                             item.statusTip = scoreObj.dotNoteAct.text + "<br><b>(" + scoreObj.dotNoteAct.key() + ")</b>";
-
                     }
 
                     Binding {
@@ -182,9 +175,8 @@ ControlBase {
 
                     Connections {
                         target: dotLoad.item
-                        onClicked: scoreObj.workRtmDot = !scoreObj.workRtmDot
+                        function onClicked() : void { scoreObj.workRtmDot = !scoreObj.workRtmDot }
                     }
-
                 }
 
             }

src/qml/score/Staff.qml

@@ -94,7 +94,7 @@ TstaffItem {
 
     Connections {
         target: score
-        onEnableKeySignChanged: checkIsKeyEnabled()
+        function onEnableKeySignChanged() : void { checkIsKeyEnabled() }
     }
 
     // measure number

src/qml/settings/InstrumentPage.qml

@@ -2,12 +2,13 @@
  * Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com)     *
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
+import Nootka
+import Nootka.Music
+import QtQuick
+import QtQuick.Controls
+import Score
 import "../"
 import "../score"
-import Nootka 1.0
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import Score 1.0
 
 Flickable {
     id: instrPage
@@ -338,13 +339,10 @@ Flickable {
 
                     width: NOO.factor() * 15
                     maximumLength: 30
-
-                    validator: RegExpValidator {
-                        regExp: /([1-2]{0,1}[0-9]{1,2}!{0,1},){0,10}/
+                    validator: RegularExpressionValidator {
+                        regularExpression: /([1-2]{0,1}[0-9]{1,2}!{0,1},){0,10}/
                     }
-
                 }
-
             }
 
         }

src/qml/shared/HeadButton.qml

@@ -84,7 +84,7 @@ ToolButton {
 
     Connections {
         target: taction
-        onShakeButton: shakeAnim.running = true
+        function onShakeButton() : void { shakeAnim.running = true }
     }
 
     SequentialAnimation {
@@ -116,10 +116,8 @@ ToolButton {
             to: 0
             duration: 50
         }
-
     }
 
     background: Item {
     }
-
 }

src/qml/sound/TempoBar.qml

@@ -210,7 +210,7 @@ Item {
 
     Connections {
         target: SOUND
-        onCountdownPrepare: {
+        function onCountdownPrepare() : void {
             if (SOUND.tickBeforePlay && !GLOB.singleNoteMode) {
                 if (!preCountItem) {
                     var d = Qt.createComponent("qrc:/sound/CountdownItem.qml");