From 9326ec09275c4dff775b31d76fa4b994555db715 Mon Sep 17 00:00:00 2001 From: dreamsyntax Date: Mon, 29 Apr 2024 22:43:46 -0700 Subject: [PATCH] Upgrade Windows Qt Submodule to 6.7.0 --- .github/workflows/build.yml | 2 +- .gitmodules | 8 ++++---- Externals/Qt | 2 +- Source/dolphin-memory-engine.default.props | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 463e425b..335c4ac0 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.5.1\x64" + cmake Source -B .\Source\bin -A x64 "-DCMAKE_PREFIX_PATH=..\Externals\Qt\Qt6.7.0\x64" cmake --build .\Source\bin --config ${{ matrix.configuration }} --parallel shell: powershell diff --git a/.gitmodules b/.gitmodules index 7335de14..fa655203 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ +[submodule "Externals/Qt-macOS"] + path = Externals/Qt-macOS + url = https://github.com/campital/ext-macos-qt-dme [submodule "Externals/Qt"] path = Externals/Qt - url = https://github.com/dolphin-emu/ext-win-qt.git + url = https://github.com/dreamsyntax/dme-ext-win-qt.git branch = master shallow = true -[submodule "Externals/Qt-macOS"] - path = Externals/Qt-macOS - url = https://github.com/campital/ext-macos-qt-dme diff --git a/Externals/Qt b/Externals/Qt index 495517af..d48be84c 160000 --- a/Externals/Qt +++ b/Externals/Qt @@ -1 +1 @@ -Subproject commit 495517af2b922c10c24f543e0fd6ea3ddf774e50 +Subproject commit d48be84cdf9c9156d73a1efc9cf12f518064aef1 diff --git a/Source/dolphin-memory-engine.default.props b/Source/dolphin-memory-engine.default.props index d492e382..63e8fbb4 100644 --- a/Source/dolphin-memory-engine.default.props +++ b/Source/dolphin-memory-engine.default.props @@ -12,7 +12,7 @@ $(SolutionDir)..\ - $(ProjectRoot)Externals\Qt\Qt6.5.1\x64\ + $(ProjectRoot)Externals\Qt\Qt6.7.0\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