Skip to content

Commit dc31bc7

Browse files
committed
Merge branch 'master' into blendsplitter
2 parents ff9c79c + 9626834 commit dc31bc7

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

.github/workflows/nightly.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ jobs:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717
steps:
1818
- name: Download artifacts
19-
uses: actions/download-artifact@v2
19+
uses: actions/download-artifact@v3
2020
- name: Get variables
2121
id: get-targets
2222
run: |
23-
echo "::set-output name=prerelease::${{ needs.build.outputs.prerelease }}"
24-
echo "::set-output name=draft::${{ needs.build.outputs.draft }}"
25-
echo "::set-output name=name::${{ needs.build.outputs.name }}"
23+
echo "prerelease=${{ needs.build.outputs.prerelease }}" >> $GITHUB_OUTPUT
24+
echo "draft=${{ needs.build.outputs.draft }}" >> $GITHUB_OUTPUT
25+
echo "name=${{ needs.build.outputs.name }}" >> $GITHUB_OUTPUT
2626
debian_target=$(find . -maxdepth 1 -type d -name "*-debian-*" -printf %f)
2727
mingw_target=$(find . -maxdepth 1 -type d -name "*-mingw-*" -printf %f)
28-
echo "::set-output name=target_debian::$target_debian"
29-
echo "::set-output name=target_mingw::$target_mingw"
28+
echo "target_debian=$target_debian" >> $GITHUB_OUTPUT
29+
echo "target_mingw=$target_mingw" >> $GITHUB_OUTPUT
3030
if [ "$debian_target" = "" ]; then
3131
echo "Target name 'mingw_target' not defined"
3232
exit 1
@@ -35,8 +35,8 @@ jobs:
3535
echo "Target name 'debian_target' not defined"
3636
exit 1
3737
fi
38-
echo "::set-output name=debian_target::$debian_target"
39-
echo "::set-output name=mingw_target::$mingw_target"
38+
echo "debian_target=$debian_target" >> $GITHUB_OUTPUT
39+
echo "mingw_target=$mingw_target" >> $GITHUB_OUTPUT
4040
- name: Package binaries as zip files
4141
run: |
4242
cd ${{ steps.get-targets.outputs.debian_target }}

.github/workflows/release.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ jobs:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717
steps:
1818
- name: Download artifacts
19-
uses: actions/download-artifact@v2
19+
uses: actions/download-artifact@v3
2020
- name: Get variables
2121
id: get-targets
2222
run: |
23-
echo "::set-output name=prerelease::${{ needs.build.outputs.prerelease }}"
24-
echo "::set-output name=draft::${{ needs.build.outputs.draft }}"
25-
echo "::set-output name=name::${{ needs.build.outputs.name }}"
23+
echo "prerelease=${{ needs.build.outputs.prerelease }}" >> $GITHUB_OUTPUT
24+
echo "draft=${{ needs.build.outputs.draft }}" >> $GITHUB_OUTPUT
25+
echo "name=${{ needs.build.outputs.name }}" >> $GITHUB_OUTPUT
2626
debian_target=$(find . -maxdepth 1 -type d -name "*-debian-*" -printf %f)
2727
mingw_target=$(find . -maxdepth 1 -type d -name "*-mingw-*" -printf %f)
28-
echo "::set-output name=target_debian::$target_debian"
29-
echo "::set-output name=target_mingw::$target_mingw"
28+
echo "target_debian=$target_debian" >> $GITHUB_OUTPUT
29+
echo "target_mingw=$target_mingw" >> $GITHUB_OUTPUT
3030
if [ "$debian_target" = "" ]; then
3131
echo "Target name 'mingw_target' not defined"
3232
exit 1
@@ -35,8 +35,8 @@ jobs:
3535
echo "Target name 'debian_target' not defined"
3636
exit 1
3737
fi
38-
echo "::set-output name=debian_target::$debian_target"
39-
echo "::set-output name=mingw_target::$mingw_target"
38+
echo "debian_target=$debian_target" >> $GITHUB_OUTPUT
39+
echo "mingw_target=$mingw_target" >> $GITHUB_OUTPUT
4040
- name: Package binaries as zip files
4141
run: |
4242
cd ${{ steps.get-targets.outputs.debian_target }}

.github/workflows/workflow-build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ jobs:
9898
prerelease='false'
9999
fi
100100
fi
101-
echo "::set-output name=draft::$draft"
101+
echo "draft=$draft" >> $GITHUB_OUTPUT
102102
echo "draft=$draft"
103-
echo "::set-output name=prerelease::$prerelease"
103+
echo "prerelease=$prerelease" >> $GITHUB_OUTPUT
104104
echo "prerelease=$prerelease"
105-
echo "::set-output name=name::$name"
105+
echo "name=$name" >> $GITHUB_OUTPUT
106106
echo "name=$name"
107-
echo "::set-output name=target::debugger-${{ matrix.cpu }}-${{ matrix.os }}${{ env.package_origin }}"
107+
echo "target=debugger-${{ matrix.cpu }}-${{ matrix.os }}${{ env.package_origin }}" >> $GITHUB_OUTPUT
108108
echo "target=$target"
109109
- name: Prepare redistributable directory
110110
run: |

src/BreakpointViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ Slot BreakpointViewer::parseSlotField(std::optional<int> index, const QString& f
277277
QStringList s = field.simplified().split("/", Qt::SplitBehaviorFlags::SkipEmptyParts);
278278

279279
std::optional<int8_t> ps;
280-
if (s[0].compare("X", Qt::CaseInsensitive)) {
280+
if (s.size() > 0 && s[0].compare("X", Qt::CaseInsensitive)) {
281281
ps = stringToValue<int8_t>(s[0]);
282282
if (!ps || !(0 <= *ps && *ps <= 3)) {
283283
if (!s[0].isEmpty()) {

0 commit comments

Comments
 (0)