From d7bf822155cafd8d473b8b7e9d45b7b26da3a1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Thu, 25 Jul 2024 14:46:00 +0000
Subject: [PATCH] QDS-13203 Update qtquickdesigner components
---
3rdparty/qtquickdesigner-components | 2 +-
README.md | 3 ++-
cicd/stages/build.yml | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/3rdparty/qtquickdesigner-components b/3rdparty/qtquickdesigner-components
index 39f8401..80b9e31 160000
--- a/3rdparty/qtquickdesigner-components
+++ b/3rdparty/qtquickdesigner-components
@@ -1 +1 @@
-Subproject commit 39f8401bdb821aa6609fbb6baadd503f57aa82d1
+Subproject commit 80b9e31a8863c9bf2a57c3d569b761d9df71cdb3
diff --git a/README.md b/README.md
index 8c8fb2a..73c517d 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,8 @@ cmake \
-DCMAKE_PREFIX_PATH=<qt-android-path> \
-DANDROID_SDK_ROOT=<android-sdk-path> \
-DANDROID_NDK_ROOT=<android-sdk-path>/ndk/<ndk-version> \
- -DANDROID_OPENSSL_PATH=<openssl-path>
+ -DANDROID_OPENSSL_PATH=<openssl-path> \
+ -DFLOWVIEW_AUTO_QMLDIR=ON
cmake --build build
cmake --install build
diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index b6dde85..5d2bd29 100644
--- a/cicd/stages/build.yml
+++ b/cicd/stages/build.yml
@@ -41,7 +41,8 @@ build-android:
-DANDROID_SDK_ROOT=${DOCKER_ENV_ANDROID_SDK_ROOT} \
-DANDROID_NDK_ROOT=${DOCKER_ENV_ANDROID_NDK_ROOT} \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
- -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH}
+ -DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH} \
+ -DFLOWVIEW_AUTO_QMLDIR=ON
- cmake --build .
- cmake --install .
- popd
--
GitLab