yindo/archived-duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-01-31 02:05:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deps: Update to Qt 6.10.0

Browse Source
This commit is contained in:
Stenzek
2025-10-09 21:00:01 +10:00
parent 00a2f5a2ce
commit cd37cd741c
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeModules/DuckStationDependencies.cmake
View File

@@ -66,7 +66,10 @@ set(CMAKE_FIND_ROOT_PATH ${FIND_ROOT_PATH_BACKUP})
# Qt has transitive dependencies on system libs, so do it afterwards.
if(BUILD_QT_FRONTEND)
find_package(Qt6 6.9.3 COMPONENTS Core Gui Widgets LinguistTools REQUIRED)
# All our builds include Qt, so this is not a problem.
set(QT_NO_PRIVATE_MODULE_WARNING ON)
find_package(Qt6 6.10.0 COMPONENTS Core Gui GuiPrivate Widgets LinguistTools REQUIRED)
# Have to verify it down here, don't want users using unpatched Qt.
if(NOT Qt6_DIR MATCHES "^${CMAKE_PREFIX_PATH}")

30
scripts/deps/versions
View File

@@ -14,8 +14,8 @@ HARFBUZZ_GZ_HASH=119778e3a692806e45104b2cdfda807a8df2ccf5421c50a016aa4b7b8226020
LIBBACKTRACE_COMMIT=793921876c981ce49759114d7bb89bb89b2d3a2d
LIBBACKTRACE_GZ_HASH=858b1225351052234f7e71f0f36622fc9ad33aac947db7816d0b443ae0dd33ce
LIBJPEGTURBO=3.1.1
LIBJPEGTURBO_GZ_HASH=aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c
LIBJPEGTURBO=3.1.2
LIBJPEGTURBO_GZ_HASH=8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf
LIBPNG=1.6.50
LIBPNG_GZ_HASH=708f4398f996325819936d447f982e0db90b6b8212b7507e7672ea232210949a
@@ -36,19 +36,19 @@ SDL3=3.2.24
SDL3_GZ_HASH=81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76
SDL3_ZIP_HASH=ca7fe2ca54a97e047f5eff236e62ae87546e862f509f0a62fc6e564ded3c6a95
QT=6.9.3
QTMINOR=6.9
QTBASE_XZ_HASH=c5a1a2f660356ec081febfa782998ae5ddbc5925117e64f50e4be9cd45b8dc6e
QTBASE_ZIP_HASH=422c06678344e358b60578a8760686313d30164a5b5795ba789412d470af3bdd
QTIMAGEFORMATS_XZ_HASH=4fb26bdbfbd4b8e480087896514e11c33aba7b6b39246547355ea340c4572ffe
QTIMAGEFORMATS_ZIP_HASH=a4f0b5f83a69b71c04a1d4be1ea47c3e1490e8e4e09cafae29004736419af299
QTSVG_XZ_HASH=db76aa3358cbbe6fce7da576ff4669cb9801920188c750d3b12783bbe97026e2
QTSVG_ZIP_HASH=cdf8be88979a35555044d37a32cb01df8bce65ea62ddb00283b29a3e0c66e6b8
QTTOOLS_XZ_HASH=0cf7ab0e975fc57f5ce1375576a0a76e9ede25e6b01db3cf2339cd4d9750b4e9
QTTOOLS_ZIP_HASH=71594dabf90790e030ece92c8a6231e91bf8b532116465704b31e14f45c0ffc2
QTTRANSLATIONS_XZ_HASH=f36d545e6681b146fd79b3ebb74ef275e88694cf81eae8323327cae3bfc490a1
QTTRANSLATIONS_ZIP_HASH=23ba3deb3473a9d9d2ab9d5c59b18f72727e67fea9f7db0bb358caa7fe6bc32a
QTWAYLAND_XZ_HASH=e413d4bc9263e80a465761debf8cb8317aa6b01e814b20046a05258e6573dadd
QT=6.10.0
QTMINOR=6.10
QTBASE_XZ_HASH=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d
QTBASE_ZIP_HASH=d3b5379edcace266273d789249b6d68ae9495ec1b0b562ba6d039034cd315d8e
QTIMAGEFORMATS_XZ_HASH=64450a52507c540de53616ed5e516df0e0905a99d3035ddfaa690f2b3f7c0cea
QTIMAGEFORMATS_ZIP_HASH=ac2fe34a9f1c1451b6785474e9b1b64eb59edef6553be3d630240f16a730456d
QTSVG_XZ_HASH=5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533
QTSVG_ZIP_HASH=c12f8bfb617e4a03da104be36f6966ba7f64bee331f0095da1a649a1149796d2
QTTOOLS_XZ_HASH=d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a
QTTOOLS_ZIP_HASH=c6d0f0a512304ad87b20f5ff604442dd8d55769d659576ecfe5462fcd7bb9b7d
QTTRANSLATIONS_XZ_HASH=326e8253cfd0cb5745238117f297da80e30ce8f4c1db81990497bd388b026cde
QTTRANSLATIONS_ZIP_HASH=e6cc1ebf62cf37d81f3b86990086108518037bb383e75da327f297cc4fc1ae36
QTWAYLAND_XZ_HASH=603f2b0a259b24bd0fb14f880d7761b1d248118a42a6870cdbe8fdda4173761f
CPUINFO_COMMIT=cdcd4afba44326d12206493620b3e0aa4935f311
CPUINFO_GZ_HASH=89947d92567619b626060e2ce9ffac590d0f8079090af5a02c88ebc448f6ec45

4
src/duckstation-qt/CMakeLists.txt
View File

@@ -178,8 +178,8 @@ set(TS_FILES
add_executable(duckstation-qt ${SRCS} ${QM_FILES})
target_precompile_headers(duckstation-qt PRIVATE "pch.h")
target_include_directories(duckstation-qt PRIVATE "${Qt6Gui_PRIVATE_INCLUDE_DIRS}" "${CMAKE_CURRENT_SOURCE_DIR}")
target_link_libraries(duckstation-qt PRIVATE core common imgui minizip scmversion Qt6::Core Qt6::Gui Qt6::Widgets)
target_include_directories(duckstation-qt PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
target_link_libraries(duckstation-qt PRIVATE core common imgui minizip scmversion Qt6::Core Qt6::Gui Qt6::GuiPrivate Qt6::Widgets)
# Our Qt builds may have exceptions on, so force them off.
target_compile_definitions(duckstation-qt PRIVATE QT_NO_EXCEPTIONS)

8
src/duckstation-qt/gamelistwidget.cpp
View File

@@ -1182,21 +1182,21 @@ public:
{
beginFilterChange();
m_merge_disc_sets = enabled;
invalidateRowsFilter();
endFilterChange(Direction::Rows);
}
void setFilterType(GameList::EntryType type)
{
beginFilterChange();
m_filter_type = type;
invalidateRowsFilter();
endFilterChange(Direction::Rows);
}
void setFilterRegion(DiscRegion region)
{
beginFilterChange();
m_filter_region = region;
invalidateRowsFilter();
endFilterChange(Direction::Rows);
}
void setFilterName(std::string name)
@@ -1204,7 +1204,7 @@ public:
beginFilterChange();
m_filter_name = std::move(name);
std::transform(m_filter_name.begin(), m_filter_name.end(), m_filter_name.begin(), StringUtil::ToLower);
invalidateRowsFilter();
endFilterChange(Direction::Rows);
}
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override