diff --git a/src/contents/ui/CrystalizerBand.qml b/src/contents/ui/CrystalizerBand.qml index 45e0f4001..e8e930ea4 100644 --- a/src/contents/ui/CrystalizerBand.qml +++ b/src/contents/ui/CrystalizerBand.qml @@ -59,7 +59,7 @@ Controls.ItemDelegate { checkable: true checked: delegate.pluginDB["muteBand" + delegate.index] onCheckedChanged: { - if (checked !== delegate.pluginDB["muteBand" + delegate.index]) + if (checked !== delegate.pluginDB["muteBand" + delegate.index]) delegate.pluginDB["muteBand" + delegate.index] = checked; } } @@ -70,7 +70,7 @@ Controls.ItemDelegate { checkable: true checked: delegate.pluginDB["bypassBand" + delegate.index] onCheckedChanged: { - if (checked !== delegate.pluginDB["bypassBand" + delegate.index]) + if (checked !== delegate.pluginDB["bypassBand" + delegate.index]) delegate.pluginDB["bypassBand" + delegate.index] = checked; } } diff --git a/src/contents/ui/Deesser.qml b/src/contents/ui/Deesser.qml index 74e18a29e..a6dc8fb72 100644 --- a/src/contents/ui/Deesser.qml +++ b/src/contents/ui/Deesser.qml @@ -352,7 +352,7 @@ Kirigami.ScrollablePage { checkable: true checked: deesserPage.pluginDB.scListen onTriggered: { - if (deesserPage.pluginDB.scListen !== checked) + if (deesserPage.pluginDB.scListen !== checked) deesserPage.pluginDB.scListen = checked; } }, diff --git a/src/contents/ui/EchoCanceller.qml b/src/contents/ui/EchoCanceller.qml index 6ce50377f..fcb8c445b 100644 --- a/src/contents/ui/EchoCanceller.qml +++ b/src/contents/ui/EchoCanceller.qml @@ -177,7 +177,7 @@ Kirigami.ScrollablePage { checkable: true checked: echoCancellerPage.pluginDB.enableAGC onTriggered: { - if (echoCancellerPage.pluginDB.enableAGC !== checked) + if (echoCancellerPage.pluginDB.enableAGC !== checked) echoCancellerPage.pluginDB.enableAGC = checked; } }, diff --git a/src/contents/ui/Expander.qml b/src/contents/ui/Expander.qml index cf3e36c70..268172aa3 100644 --- a/src/contents/ui/Expander.qml +++ b/src/contents/ui/Expander.qml @@ -856,7 +856,7 @@ Kirigami.ScrollablePage { checkable: true checked: expanderPage.pluginDB.sidechainListen onTriggered: { - if (expanderPage.pluginDB.sidechainListen !== checked) + if (expanderPage.pluginDB.sidechainListen !== checked) expanderPage.pluginDB.sidechainListen = checked; } }, @@ -866,7 +866,7 @@ Kirigami.ScrollablePage { checkable: true checked: expanderPage.pluginDB.stereoSplit onTriggered: { - if (expanderPage.pluginDB.stereoSplit !== checked) + if (expanderPage.pluginDB.stereoSplit !== checked) expanderPage.pluginDB.stereoSplit = checked; } }, diff --git a/src/contents/ui/Gate.qml b/src/contents/ui/Gate.qml index cd3993d7f..a8c239aee 100644 --- a/src/contents/ui/Gate.qml +++ b/src/contents/ui/Gate.qml @@ -985,7 +985,7 @@ Kirigami.ScrollablePage { checkable: true checked: gatePage.pluginDB.sidechainListen onTriggered: { - if (gatePage.pluginDB.sidechainListen !== checked) + if (gatePage.pluginDB.sidechainListen !== checked) gatePage.pluginDB.sidechainListen = checked; } }, @@ -995,7 +995,7 @@ Kirigami.ScrollablePage { checkable: true checked: gatePage.pluginDB.stereoSplit onTriggered: { - if (gatePage.pluginDB.stereoSplit !== checked) + if (gatePage.pluginDB.stereoSplit !== checked) gatePage.pluginDB.stereoSplit = checked; } }, diff --git a/util/flatpak/easyeffects-modules.json b/util/flatpak/easyeffects-modules.json index 1f0c8f6ef..683c0512f 100644 --- a/util/flatpak/easyeffects-modules.json +++ b/util/flatpak/easyeffects-modules.json @@ -39,11 +39,8 @@ "tag": "v1.2.6", "commit": "67b33abe1558160ed76ada1322329b0e9e058b02", "x-checker-data": { - "type": "json", - "url": "https://api.github.com/repos/jiixyj/libebur128/releases/latest", - "tag-query": ".tag_name", - "version-query": "$tag | sub(\"^jq-\"; \"\")", - "timestamp-query": ".published_at" + "type": "git", + "tag-pattern": "^v([\\d.]+)$" } } ] diff --git a/util/qmlformat.sh b/util/qmlformat.sh index 0f88efb49..bc2628049 100755 --- a/util/qmlformat.sh +++ b/util/qmlformat.sh @@ -9,13 +9,18 @@ fi # unlike qmllint, this can also be used on js files, not just qml files, so glob everything in the directory -# for some reason the arch qt6-declarative package doesn't add this to the normally searched directories if [[ -f /usr/lib/qt6/bin/qmlformat ]]; then - /usr/lib/qt6/bin/qmlformat src/contents/ui/* --inplace "$@" -# for fedora -elif command -v qmlformat-qt6 --help &>/dev/null; then - qmlformat-qt6 src/contents/ui/* --inplace "$@" + QMLFORMAT="/usr/lib/qt6/bin/qmlformat" +elif command -v qmlformat &>/dev/null; then + QMLFORMAT="qmlformat" +elif command -v qmlformat-qt6 &>/dev/null; then + QMLFORMAT="qmlformat-qt6" else echo "ERROR: Could not find qmlformat qt6" exit 1 fi + +echo "Using qmlformat at: $QMLFORMAT" +$QMLFORMAT src/contents/ui/* --inplace "$@" || { + echo "qmlformat returned $?. This is ignored as Qt 6.7 qmlformat has known bugs returning 1. git diff will catch unformatted files." +} diff --git a/util/qmllint.sh b/util/qmllint.sh index 4033880fb..0f4068a98 100755 --- a/util/qmllint.sh +++ b/util/qmllint.sh @@ -10,8 +10,10 @@ fi # for some reason the arch qt6-declarative package doesn't add this to the normally searched directories if [[ -f /usr/lib/qt6/bin/qmllint ]]; then /usr/lib/qt6/bin/qmllint src/contents/ui/*.qml "$@" +elif command -v qmllint &>/dev/null; then + qmllint src/contents/ui/*.qml "$@" # for fedora -elif command -v qmllint-qt6 --help &>/dev/null; then +elif command -v qmllint-qt6 &>/dev/null; then qmllint-qt6 src/contents/ui/*.qml "$@" else echo "ERROR: Could not find qmllint qt6"