diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2026-06-26 20:56:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-26 20:56:43 +0200 |
| commit | d0f9446a8c81b4f8841c5ae9c19f69d4252fc5ce (patch) | |
| tree | e37fab483d3d2b8e6590728ce3705165daef91b6 /Source | |
| parent | 14ee972235a4127d3e928f05e6e479fe47a21039 (diff) | |
| parent | e87225beb25440c8b6f3b82019028681cf248160 (diff) | |
Merge pull request #14663 from AdmiralCurtiss/qt6.8.3
Update bundled Windows Qt to 6.8.3
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.props | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 02700d1c18..f4ba46d2f9 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -1,8 +1,8 @@ if (MSVC) if(_M_ARM_64) - list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/ARM64") + list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.3/ARM64") else() - list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/x64") + list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.3/x64") endif() endif() diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index c42c823f88..bc3c4fe410 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project> <PropertyGroup Label="UserMacros"> - <ExternalsQtDir>$(ExternalsDir)Qt\Qt6.5.1\</ExternalsQtDir> + <ExternalsQtDir>$(ExternalsDir)Qt\Qt6.8.3\</ExternalsQtDir> <QtTargetDirDefault>$(ExternalsQtDir)$(Platform)\</QtTargetDirDefault> <QTDIR Condition="Exists('$(QtTargetDirDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QtTargetDirDefault)</QTDIR> <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR> @@ -113,7 +113,7 @@ <QtDllNames Include="@(QtDllNames_ -> '%(Identity)$(QtLibSuffix).dll')" /> <QtDllsSrc Include="@(QtDllNames -> '$(QtBinDir)%(Identity)')" /> <QtDllsDst Include="@(QtDllNames -> '$(BinaryOutputDir)%(Identity)')" /> - <QtPluginNames_ Include="iconengines\qsvgicon;imageformats\qsvg;platforms\qdirect2d;platforms\qwindows;styles\qwindowsvistastyle"/> + <QtPluginNames_ Include="iconengines\qsvgicon;imageformats\qsvg;platforms\qdirect2d;platforms\qwindows;styles\qmodernwindowsstyle"/> <QtPluginNames Include="@(QtPluginNames_ -> '%(Identity)$(QtLibSuffix).dll')" /> <QtPluginsSrc Include="@(QtPluginNames -> '$(QtPluginsDir)%(Identity)')" /> <QtPluginsDst Include="@(QtPluginNames -> '$(BinaryOutputDir)$(QtPluginFolder)\%(Identity)')" /> |