From 0fe909e9b5ae4efd2bf84c491d4e4c6d562e59c2 Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Mon, 13 Jan 2025 13:33:34 +0100
Subject: [PATCH 1/4] add: qtquick timeline modules
---
CMakeLists.txt | 2 +-
src/{importdummy_wasm.qml => importdummy.qml} | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
rename src/{importdummy_wasm.qml => importdummy.qml} (93%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab5b962..f5e6f46 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/src/importdummy_wasm.qml b/src/importdummy.qml
similarity index 93%
rename from src/importdummy_wasm.qml
rename to src/importdummy.qml
index 170c25a..4285396 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
--
GitLab
From 71f860a4833a6b6a389d6e020f3bb20bdd01d2d3 Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Mon, 13 Jan 2025 16:35:12 +0100
Subject: [PATCH 2/4] chore: move the pipeline to default runners
---
cicd/stages/build.yml | 4 ++--
cicd/stages/release.yml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index f052b55..31e8e77 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 4a79fd6..5c518ad 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:
--
GitLab
From 013752a36cbd60f1c647bf1498d0c768df3124a2 Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Mon, 13 Jan 2025 16:44:43 +0100
Subject: [PATCH 3/4] chore: rollback the other changes
---
CMakeLists.txt | 2 +-
src/{importdummy.qml => importdummy_wasm.qml} | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
rename src/{importdummy.qml => importdummy_wasm.qml} (93%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e6f46..ab5b962 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.qml
+ src/importdummy_wasm.qml
src/main.cpp
src/designviewer.cpp src/designviewer.h
)
diff --git a/src/importdummy.qml b/src/importdummy_wasm.qml
similarity index 93%
rename from src/importdummy.qml
rename to src/importdummy_wasm.qml
index 4285396..170c25a 100644
--- a/src/importdummy.qml
+++ b/src/importdummy_wasm.qml
@@ -25,9 +25,6 @@ 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
--
GitLab
From 9bf1e0dbb693f93b33632ad92191ad5fc6f2aa16 Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Mon, 13 Jan 2025 16:45:31 +0100
Subject: [PATCH 4/4] chore: cleanup
---
cicd/stages/build.yml | 2 --
cicd/stages/release.yml | 4 ----
2 files changed, 6 deletions(-)
diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index 31e8e77..310638a 100644
--- a/cicd/stages/build.yml
+++ b/cicd/stages/build.yml
@@ -2,8 +2,6 @@
# https://git.qt.io/design-studio/maintenance/docker-images/container_registry
build-wasm:
stage: build
- # 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 5c518ad..828e921 100644
--- a/cicd/stages/release.yml
+++ b/cicd/stages/release.yml
@@ -1,8 +1,6 @@
create-packages:
stage: release
image: alpine:latest
- # tags:
- # - linux-blade
rules:
- if: $CI_COMMIT_TAG
needs:
@@ -29,8 +27,6 @@ create-packages:
create-release:
stage: release
image: registry.gitlab.com/gitlab-org/release-cli:latest
- # tags:
- # - linux-blade
rules:
- if: $CI_COMMIT_TAG
needs:
--
GitLab