diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f062b9c..5af985a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,8 @@ on: env: QT_VERSION: 6.10.3 # Keep in sync with CMakeLists.txt KF_VERSION: v6.26.0 # Ditto - KIRIGAMI_ADDONS_VERSION: v1.12.0 # Ditto x2 + # TODO: switch back to released version once https://invent.kde.org/libraries/kirigami-addons/-/commit/476b855c8d4606e75548b8f774a9c4ffe7897e32 is in a release + KIRIGAMI_ADDONS_VERSION: master # Ditto x2 PLASMA_VERSION: v6.6.5 # For Breeze COMMON_CMAKE_OPTIONS: "-DBUILD_TESTING=OFF -DBUILD_PYTHON_BINDINGS=OFF" QCORO_VERSION: v0.13.0 @@ -292,7 +293,7 @@ jobs: Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/libgcrypt-20.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KF6ConfigCore.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/libgpg-error6-0.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin - Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/z.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin + Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/libz.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/libwinpthread-1.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/libcrypto-1_1-x64.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KF6BreezeIcons.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index df340d7..f51eed9 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -5,7 +5,11 @@ add_library(astra_static STATIC) ecm_add_qml_module(astra_static GENERATE_PLUGIN_SOURCE URI zone.xiv.astra - VERSION 1.0) + VERSION 1.0 + DEPENDENCIES + org.kde.kirigami + Qt.labs.qmlmodels +) ecm_qt_declare_logging_category(astra_static HEADER astra_log.h