Merge pull request #130 from aldelaro5/qt6.5.3

Windows Ext: Qt 6.7.0 -> 6.5.3
aldelaro5 · May 11, 2024 · 0e415fe · 0e415fe
2 parents 3d1a2e9 + db5be27
commit 0e415fe
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake Source -B .\Source\bin -A x64 "-DCMAKE_PREFIX_PATH=..\Externals\Qt\Qt6.7.0\x64"
+          cmake Source -B .\Source\bin -A x64 "-DCMAKE_PREFIX_PATH=..\Externals\Qt\Qt6.5.3\x64"
           cmake --build .\Source\bin --config ${{ matrix.configuration }} --parallel
         shell: powershell
 

diff --git a/Externals/Qt b/Externals/Qt
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -144,7 +144,7 @@ if(WIN32)
             $<TARGET_FILE_DIR:dolphin-memory-engine>/styles
         TARGET dolphin-memory-engine POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:Qt6::QModernWindowsStylePlugin>
+            $<TARGET_FILE:Qt6::QWindowsVistaStylePlugin>
             $<TARGET_FILE_DIR:dolphin-memory-engine>/styles
     )
 endif(WIN32)

diff --git a/Source/dolphin-memory-engine.default.props b/Source/dolphin-memory-engine.default.props
@@ -12,7 +12,7 @@
     <!-- Root of project -->
     <ProjectRoot>$(SolutionDir)..\</ProjectRoot>
     <!-- Path to Qt build files -->
-    <QTDIR>$(ProjectRoot)Externals\Qt\Qt6.7.0\x64\</QTDIR>
+    <QTDIR>$(ProjectRoot)Externals\Qt\Qt6.5.3\x64\</QTDIR>
     <!-- Flags passed to Qt's MOC tool, values dependent on current configuration -->
     <QtMocFlags Condition="'$(Configuration)' == 'Debug'">-DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB</QtMocFlags>
     <QtMocFlags Condition="'$(Configuration)' == 'Release'">-DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB</QtMocFlags>

diff --git a/Source/dolphin-memory-engine.vcxproj b/Source/dolphin-memory-engine.vcxproj
@@ -106,7 +106,7 @@
     <FilesToCopy Include="$(QTDIR)plugins\platforms\qwindows$(DebugSuffix).dll">
       <SubDir>platforms\</SubDir>
     </FilesToCopy>
-    <FilesToCopy Include="$(QTDIR)plugins\styles\qmodernwindowsstyle$(DebugSuffix).dll">
+    <FilesToCopy Include="$(QTDIR)plugins\styles\qwindowsvistastyle$(DebugSuffix).dll">
       <SubDir>styles\</SubDir>
     </FilesToCopy>
   </ItemGroup>