Skip to content

fix(build): Fix build with newer Qt version #268

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

Merged
narnaud merged 2 commits into from
Mar 9, 2026
Merged

fix(build): Fix build with newer Qt version #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0778d75
fix(build): Fix build with newer Qt version
Mar 2, 2026
4a20c9b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 9, 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
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ find_package(
Qt6 6.5
COMPONENTS Widgets Qml Quick Test UiTools
REQUIRED)

if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
set(QT_NO_PRIVATE_MODULE_WARNING ON)
find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED
COMPONENTS CorePrivate WidgetsPrivate QmlPrivate)
endif()
# 3rdparty
# ##############################################################################
add_subdirectory(3rdparty)
Expand Down
7 changes: 7 additions & 0 deletions src/gui/qttsview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,15 @@ class QtTsProxy : public QSortFilterProxyModel

void setFilterText(const QString &str)
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
beginFilterChange();
#endif
m_filterText = str;
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
endFilterChange();
#else
invalidateFilter();
#endif
}

protected:
Expand Down
15 changes: 9 additions & 6 deletions tests/tst_rcwriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ private slots:
}
if (buffer.open(QIODevice::ReadOnly)) {
QFile file(Test::testDataPath() + "/tst_rcwriter/qrc_expected_default.qrc");
file.open(QIODevice::ReadOnly);
QCOMPARE(buffer.readAll(), file.readAll());
if (file.open(QIODevice::ReadOnly)) {
QCOMPARE(buffer.readAll(), file.readAll());
}
}
}

Expand All @@ -54,8 +55,9 @@ private slots:
}
if (buffer.open(QIODevice::ReadOnly)) {
QFile file(Test::testDataPath() + "/tst_rcwriter/qrc_expected_noalias_onlyexist.qrc");
file.open(QIODevice::ReadOnly);
QCOMPARE(buffer.readAll(), file.readAll());
if (file.open(QIODevice::ReadOnly)) {
QCOMPARE(buffer.readAll(), file.readAll());
}
}
}
}
Expand Down Expand Up @@ -111,8 +113,9 @@ private slots:
// file.write(buffer.data());
// file.close();
// }
file.open(QIODevice::ReadOnly);
QCOMPARE(buffer.readAll(), file.readAll());
if (file.open(QIODevice::ReadOnly)) {
QCOMPARE(buffer.readAll(), file.readAll());
}
} else {
QWidget *widget = loader.load(&buffer);
QVERIFY2(loader.errorString().isEmpty(), dialog.id.toLatin1());
Expand Down