Skip to content

Commit 906be91

Browse files
committed
update qt version for CI
1 parent 177e8cc commit 906be91

File tree

3 files changed

+36
-3
lines changed

3 files changed

+36
-3
lines changed

.github/workflows/cpp-ci-serial-programs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [windows-2022, macos-13, ubuntu-24.04]
13-
qt_version: ['5.12.12', '6.7.2']
13+
qt_version: ['5.12.12', '6.8.1']
1414
include:
1515
- qt_version: '5.12.12'
1616
qt_version_major: '5'
1717
qt_modules: ''
1818

19-
- qt_version: '6.7.2'
19+
- qt_version: '6.8.1'
2020
qt_version_major: '6'
2121
qt_modules: 'qtmultimedia qtserialport'
2222

@@ -37,7 +37,7 @@ jobs:
3737
if: startsWith(matrix.os, 'mac')
3838
run: |
3939
brew install opencv
40-
- uses: jurplel/install-qt-action@v3
40+
- uses: jurplel/install-qt-action@v4
4141
with:
4242
version: ${{ matrix.qt_version }}
4343
modules: ${{ matrix.qt_modules }}

Common/Qt/Options/BooleanCheckBoxWidget.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,21 @@ BooleanCheckBoxCellWidget::BooleanCheckBoxCellWidget(QWidget& parent, BooleanChe
3838
m_box = new QCheckBox(this);
3939
m_box->setChecked(m_value);
4040
layout->addWidget(m_box);
41+
#if QT_VERSION < 0x060700
4142
connect(
4243
m_box, &QCheckBox::stateChanged,
4344
this, [this](int){
4445
m_value = m_box->isChecked();
4546
}
4647
);
48+
#else
49+
connect(
50+
m_box, &QCheckBox::checkStateChanged,
51+
this, [this](Qt::CheckState){
52+
m_value = m_box->isChecked();
53+
}
54+
);
55+
#endif
4756
value.add_listener(*this);
4857
}
4958
void BooleanCheckBoxCellWidget::update_value(){
@@ -81,12 +90,21 @@ BooleanCheckBoxOptionWidget::BooleanCheckBoxOptionWidget(QWidget& parent, Boolea
8190
m_box = new QCheckBox(this);
8291
m_box->setChecked(m_value);
8392
layout->addWidget(m_box, 1);
93+
#if QT_VERSION < 0x060700
8494
connect(
8595
m_box, &QCheckBox::stateChanged,
8696
this, [this](int){
8797
m_value = m_box->isChecked();
8898
}
8999
);
100+
#else
101+
connect(
102+
m_box, &QCheckBox::checkStateChanged,
103+
this, [this](int){
104+
m_value = m_box->isChecked();
105+
}
106+
);
107+
#endif
90108
value.add_listener(*this);
91109
}
92110
void BooleanCheckBoxOptionWidget::update_value(){

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ CommandRow::CommandRow(
7979
m_overlay_boxes, &QCheckBox::clicked,
8080
this, [this](bool checked){ m_session.set_enabled_boxes(checked); }
8181
);
82+
#if QT_VERSION < 0x060700
8283
connect(
8384
m_overlay_text, &QCheckBox::stateChanged,
8485
this, [this](bool checked){ m_session.set_enabled_text(checked); }
@@ -91,6 +92,20 @@ CommandRow::CommandRow(
9192
m_overlay_stats, &QCheckBox::stateChanged,
9293
this, [this](bool checked){ m_session.set_enabled_stats(checked); }
9394
);
95+
#else
96+
connect(
97+
m_overlay_text, &QCheckBox::checkStateChanged,
98+
this, [this](Qt::CheckState state){ m_session.set_enabled_text(state == Qt::Checked); }
99+
);
100+
connect(
101+
m_overlay_log, &QCheckBox::checkStateChanged,
102+
this, [this](Qt::CheckState state){ m_session.set_enabled_log(state == Qt::Checked); }
103+
);
104+
connect(
105+
m_overlay_stats, &QCheckBox::checkStateChanged,
106+
this, [this](Qt::CheckState state){ m_session.set_enabled_stats(state == Qt::Checked); }
107+
);
108+
#endif
94109
connect(
95110
m_load_profile_button, &QPushButton::clicked,
96111
this, [this](bool) { emit load_profile(); }

0 commit comments

Comments
 (0)