Skip to content

Commit

Permalink
Upgrade Windows Qt Submodule to 6.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamsyntax committed Apr 30, 2024
1 parent cd16d39 commit 9326ec0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Externals/Qt
Submodule Qt updated 6522 files
2 changes: 1 addition & 1 deletion Source/dolphin-memory-engine.default.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Root of project -->
<ProjectRoot>$(SolutionDir)..\</ProjectRoot>
<!-- Path to Qt build files -->
<QTDIR>$(ProjectRoot)Externals\Qt\Qt6.5.1\x64\</QTDIR>
<QTDIR>$(ProjectRoot)Externals\Qt\Qt6.7.0\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>
Expand Down

0 comments on commit 9326ec0

Please sign in to comment.