Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows Ext: Qt 6.7.0 -> 6.5.3 #130

Merged
merged 1 commit into from
May 11, 2024
Merged

Windows Ext: Qt 6.7.0 -> 6.5.3 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
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.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

Expand Down
2 changes: 1 addition & 1 deletion Externals/Qt
Open in desktop
Submodule Qt updated 3499 files
2 changes: 1 addition & 1 deletion Source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/dolphin-memory-engine.default.props
View file
Open in desktop
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.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>
Expand Down
2 changes: 1 addition & 1 deletion Source/dolphin-memory-engine.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down