From db5be27b401cba8163bdcb81779553162f1c3f63 Mon Sep 17 00:00:00 2001 From: dreamsyntax Date: Sat, 11 May 2024 15:59:26 -0700 Subject: [PATCH] Qt 6.7.0 -> 6.5.3 --- .github/workflows/build.yml | 2 +- Externals/Qt | 2 +- Source/CMakeLists.txt | 2 +- Source/dolphin-memory-engine.default.props | 2 +- Source/dolphin-memory-engine.vcxproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 335c4ac0..1fa6814f 100644 --- 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 index d48be84c..9d10fa06 160000 --- a/Externals/Qt +++ b/Externals/Qt @@ -1 +1 @@ -Subproject commit d48be84cdf9c9156d73a1efc9cf12f518064aef1 +Subproject commit 9d10fa062b8ec37fbe7022333397fc0ab110a24d diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 042ef2ae..50609bd5 100755 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -144,7 +144,7 @@ if(WIN32) $/styles TARGET dolphin-memory-engine POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - $ + $ $/styles ) endif(WIN32) diff --git a/Source/dolphin-memory-engine.default.props b/Source/dolphin-memory-engine.default.props index 63e8fbb4..a00db86c 100644 --- a/Source/dolphin-memory-engine.default.props +++ b/Source/dolphin-memory-engine.default.props @@ -12,7 +12,7 @@ $(SolutionDir)..\ - $(ProjectRoot)Externals\Qt\Qt6.7.0\x64\ + $(ProjectRoot)Externals\Qt\Qt6.5.3\x64\ -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB diff --git a/Source/dolphin-memory-engine.vcxproj b/Source/dolphin-memory-engine.vcxproj index 07fdd619..41e71bc2 100755 --- a/Source/dolphin-memory-engine.vcxproj +++ b/Source/dolphin-memory-engine.vcxproj @@ -106,7 +106,7 @@ platforms\ - + styles\