Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#31147: cmake, qt, test: Remove problematic code
Browse files Browse the repository at this point in the history
fb46d57 cmake, qt, test: Remove problematic code (Hennadii Stepanov)

Pull request description:

  Split from bitcoin/bitcoin#30997.

  The removed code aimed to make Qt's minimal integration plugin DLL available for `test_bitcoin-qt.exe` on Windows.

  However, there are two issues:
  1. The code is broken because the destination directory must end with a trailing slash (`/`).
  2. It is unnecessary because Qt's minimal integration plugin is not used on Windows. For more details, please refer to the following code:https://github.com/bitcoin/bitcoin/blob/fb46d57d4e7263495c007f4a499a349bff2b21e0/src/qt/test/CMakeLists.txt#L38-L44

  As a side effect, this PR fixes #842.

ACKs for top commit:
  fanquake:
    ACK fb46d57
  TheCharlatan:
    ACK fb46d57

Tree-SHA512: b44d1c5e352e9bbfbba3c263ee03838cd490435da0490d9c8a152e60515520772c8a87aca08d4510f50c2e46b64ac92c666fa81accf43758af2e896693c44ffa
  • Loading branch information
fanquake committed Oct 24, 2024
2 parents 2f40e45 + fb46d57 commit 0c79c34
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/qt/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ if(ENABLE_WALLET)
)
endif()

if(NOT QT_IS_STATIC)
add_custom_command(
TARGET test_bitcoin-qt POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_PROPERTY:Qt5::QMinimalIntegrationPlugin,LOCATION_$<UPPER_CASE:$<CONFIG>>> $<TARGET_FILE_DIR:test_bitcoin-qt>/plugins/platforms
VERBATIM
)
endif()

add_test(NAME test_bitcoin-qt
COMMAND test_bitcoin-qt
)
Expand Down

0 comments on commit 0c79c34

Please sign in to comment.