Skip to content

Fix qmlformat script for newer Arch #5229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kairosci wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix qmlformat script for newer Arch #5229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0767ed
Fix failing QML format and flatpak lint CI jobs
kairosci Aug 7, 2026
34856be
Fix bugs in qmlformat/qmllint scripts
kairosci Aug 7, 2026
6c6f6f7
Fix QML formatting as requested by CI
kairosci Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/contents/ui/CrystalizerBand.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/contents/ui/Deesser.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/contents/ui/EchoCanceller.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/contents/ui/Expander.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand All @@ -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;
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/contents/ui/Gate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand All @@ -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;
}
},
Expand Down
7 changes: 2 additions & 5 deletions util/flatpak/easyeffects-modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.]+)$"
}
}
]
Expand Down
15 changes: 10 additions & 5 deletions util/qmlformat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
4 changes: 3 additions & 1 deletion util/qmllint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading