diff --git a/.github/workflows/github-cxx-qt-tests.yml b/.github/workflows/github-cxx-qt-tests.yml index 24f9b9cd1..b4baead5c 100644 --- a/.github/workflows/github-cxx-qt-tests.yml +++ b/.github/workflows/github-cxx-qt-tests.yml @@ -193,13 +193,8 @@ jobs: # Ensure clippy and rustfmt is installed, they should come from github runner # # Note we still need rustfmt for the cxx-qt-gen tests - # - # TODO: Remove the `rustup default 1.77` selection. - # This is a workaround for Github Actions, which cannot currently compile CXX-Qt with Rust 1.78. - # - # See: https://github.com/KDAB/cxx-qt/issues/958 - name: "Install Rust toolchain" - run: rustup default 1.77 && rustup component add clippy rustfmt + run: rustup component add clippy rustfmt - name: "Rust tools cache" uses: actions/cache@v4 diff --git a/examples/demo_threading/CMakeLists.txt b/examples/demo_threading/CMakeLists.txt index c8e712633..73f23630d 100644 --- a/examples/demo_threading/CMakeLists.txt +++ b/examples/demo_threading/CMakeLists.txt @@ -60,6 +60,10 @@ target_link_libraries(${APP_NAME}_lib INTERFACE Qt::QuickControls2 ) +if (MSVC) + add_link_options("/FORCE:MULTIPLE") +endif() + # Qt Graphical Effects imports changed in Qt 6 so provide proxies if(Qt5_FOUND) set(QML_COMPAT_RESOURCES qml/compat/compat_qt5.qrc) diff --git a/examples/qml_features/CMakeLists.txt b/examples/qml_features/CMakeLists.txt index ebdab49a4..aec77f876 100644 --- a/examples/qml_features/CMakeLists.txt +++ b/examples/qml_features/CMakeLists.txt @@ -60,6 +60,10 @@ target_link_libraries(${APP_NAME}_lib INTERFACE Qt::QuickControls2 ) +if (MSVC) + add_link_options("/FORCE:MULTIPLE") +endif() + add_executable(${APP_NAME} cpp/main.cpp ) diff --git a/examples/qml_minimal/CMakeLists.txt b/examples/qml_minimal/CMakeLists.txt index 464bebedc..d9b51d095 100644 --- a/examples/qml_minimal/CMakeLists.txt +++ b/examples/qml_minimal/CMakeLists.txt @@ -89,6 +89,11 @@ target_link_libraries(${APP_NAME}_lib INTERFACE ) # ANCHOR_END: book_cmake_use_corrosion +if (MSVC) + add_link_options("/FORCE:MULTIPLE") +endif() + + # ANCHOR: book_cmake_executable # Define the executable with the C++ source add_executable(${APP_NAME} cpp/main.cpp)