diff --git a/CMakeLists.txt b/CMakeLists.txt index ab5b962cae8d8ada649c50a89c3bdbc3d229601d..f5e6f466b520603d6a1cbea675982a7cbb7a216d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ if(QT_VERSION VERSION_LESS QT_MINIMUM_VERSION) endif() qt_add_executable(${PROJECT_NAME} - src/importdummy_wasm.qml + src/importdummy.qml src/main.cpp src/designviewer.cpp src/designviewer.h ) diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml index f052b55921e7cda667b33f952aa615f26f96f461..31e8e77f55c84a3afb41d07c1953d7068a084257 100644 --- a/cicd/stages/build.yml +++ b/cicd/stages/build.yml @@ -2,8 +2,8 @@ # https://git.qt.io/design-studio/maintenance/docker-images/container_registry build-wasm: stage: build - tags: - - linux-blade + # tags: + # - linux-blade rules: - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "merge_request_event" cache: diff --git a/cicd/stages/release.yml b/cicd/stages/release.yml index 4a79fd67c60f174b3e1fa8811abfe90cb755b20c..5c518aded7e2e642d2ad168d1405a340ecf06d9c 100644 --- a/cicd/stages/release.yml +++ b/cicd/stages/release.yml @@ -1,8 +1,8 @@ create-packages: stage: release image: alpine:latest - tags: - - linux-blade + # tags: + # - linux-blade rules: - if: $CI_COMMIT_TAG needs: @@ -29,8 +29,8 @@ create-packages: create-release: stage: release image: registry.gitlab.com/gitlab-org/release-cli:latest - tags: - - linux-blade + # tags: + # - linux-blade rules: - if: $CI_COMMIT_TAG needs: diff --git a/src/importdummy_wasm.qml b/src/importdummy.qml similarity index 93% rename from src/importdummy_wasm.qml rename to src/importdummy.qml index 170c25acc20f45d3654aef0ed2fb6f9fb6202bd6..42853961a92ea4fd1658dbe4787b9d163500e8c1 100644 --- a/src/importdummy_wasm.qml +++ b/src/importdummy.qml @@ -25,6 +25,9 @@ import QtQuick.Studio.MultiText import QtQuick.Studio.Utils import QtQuick.Studio.DesignEffects +import QtQuick.Timeline +import QtQuick.Timeline.BlendTrees + import QtQuickUltralite.Extras import QtQuickUltralite.Layers