mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-16 05:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Qt 6.8.0

Browse source
This commit is contained in:
Nayla Hanegan 2024-11-04 10:31:19 -05:00
parent c1c5d8a316
commit b3630a69b3
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Externals/Qt vendored

@ -1 +1 @@
Subproject commit 44e2103ff57aeca435f3b99f303197ecb9447ce5 Subproject commit 660ac2560e62f3abfa4d9ce410a476747aad52f1

4
Source/Core/DolphinQt/CMakeLists.txt
View file

@ -5,9 +5,9 @@ endif()
if (MSVC) if (MSVC)
if(_M_ARM_64) if(_M_ARM_64)
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.7.0/ARM64") list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.0/ARM64")
else() else()
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.7.0/x64") list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.0/x64")
endif() endif()
endif() endif()

3
Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
View file

@ -280,7 +280,6 @@ void GeckoCodeWidget::LoadCodes()
m_add_code->setEnabled(!m_game_id.empty()); m_add_code->setEnabled(!m_game_id.empty());
m_edit_code->setEnabled(false); m_edit_code->setEnabled(false);
m_remove_code->setEnabled(false); m_remove_code->setEnabled(false);
m_download_codes->setEnabled(!m_game_id.empty());
UpdateList(); UpdateList();
} }
@ -376,4 +375,4 @@ void GeckoCodeWidget::UpdateList()
} }
m_code_list->setDragDropMode(QAbstractItemView::InternalMove); m_code_list->setDragDropMode(QAbstractItemView::InternalMove);
} }

2
Source/VSProps/QtCompile.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project> <Project>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<ExternalsQtDir>$(ExternalsDir)Qt\Qt6.7.0\</ExternalsQtDir> <ExternalsQtDir>$(ExternalsDir)Qt\Qt6.8.0\</ExternalsQtDir>
<QtTargetDirDefault>$(ExternalsQtDir)$(Platform)\</QtTargetDirDefault> <QtTargetDirDefault>$(ExternalsQtDir)$(Platform)\</QtTargetDirDefault>
<QTDIR Condition="Exists('$(QtTargetDirDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QtTargetDirDefault)</QTDIR> <QTDIR Condition="Exists('$(QtTargetDirDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QtTargetDirDefault)</QTDIR>
<QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR> <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR>