Skip to content

Commit

Permalink
Merge pull request #199 from aldelaro5/revert-188-windows-qt682
Browse files Browse the repository at this point in the history
Revert "Externals: Qt6.8.2 for Windows"
  • Loading branch information
dreamsyntax authored Mar 1, 2025
2 parents 6fd1d5f + 9e56647 commit 52d459b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Build
run: |
cmake Source -B .\Source\bin -A x64 "-DCMAKE_PREFIX_PATH=..\Externals\Qt\Qt6.8.2\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
Submodule Qt updated 3662 files
4 changes: 2 additions & 2 deletions Source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if (WIN32)
find_package(Qt6Widgets QUIET)
if (NOT Qt6Widgets_FOUND)
message(STATUS "Qt package not found, using external lib")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}\\..\\Externals\\Qt\\Qt6.8.2\\x64")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}\\..\\Externals\\Qt\\Qt6.5.3\\x64")
find_package(Qt6Widgets REQUIRED)
endif ()
else ()
Expand Down Expand Up @@ -174,7 +174,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

0 comments on commit 52d459b

Please sign in to comment.