Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt UI Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Design Studio
QML Viewer Projects
Qt UI Viewer
Merge requests
!53
QDS-13458
New UI with target functionalities
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
QDS-13458
New UI with target functionalities
QDS-13458/new-ui
into
master
Overview
0
Commits
22
Pipelines
3
Changes
27
Merged
Burak Hançerli
requested to merge
QDS-13458/new-ui
into
master
7 months ago
Overview
0
Commits
22
Pipelines
3
Changes
27
Expand
This MR brings the following changes;
add:
QDS-13458
the new UI for the viewer
add:
QDS-13721
start/stop commands in between Design Studio and the app
add:
QDS-13716
live log sharing with Design Studio
add: force pairing. no 2-step pairing is necessary
add: singleton logger class for better log management all over the app
cicd: auto Google Play versioning in the CI
test: increase the test timeout to prevent immature interruptions
doc: update README.md
Edited
7 months ago
by
Burak Hançerli
0
0
Merge request reports
Compare
master
version 1
adaa1c08
7 months ago
master (base)
and
latest version
latest version
9c9c0ca0
22 commits,
7 months ago
version 1
adaa1c08
21 commits,
7 months ago
27 files
+
954
−
670
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
27
Search (e.g. *.vue) (Ctrl+P)
cicd/stages/build.yml
+
9
−
0
Options
@@ -18,6 +18,14 @@
-
popd
.build-android-apps
:
&build-android-apps
-
export GOOGLE_PLAY_APP_VERSION=$(( $(git tag --list | wc -l) +11 ))
# where is this magic "$(git tag --list | wc -l) +11" coming from?
# "git tag --list | wc -l" counts the number of tags in the repository.
# The "+11" is a magic number which is the last GOOGLE_PLAY_APP_VERSION
# that was released before starting to add tags to the repository. After
# GOOGLE_PLAY_APP_VERSION=11, the tags are added to the repository, and
# the GOOGLE_PLAY_APP_VERSION is incremented by 1 for each new tag.
-
'
echo
"Google
Play
App
Version:
${GOOGLE_PLAY_APP_VERSION}"'
-
|
cmake \
-S . \
@@ -30,6 +38,7 @@
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
-DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_QT_ANDROID_PATH} \
-DANDROID_OPENSSL_PATH=${QDS_CI_JOB_OPENSSL_PATH} \
-DGOOGLE_PLAY_APP_VERSION=${GOOGLE_PLAY_APP_VERSION} \
-DBUILD_EXAMPLES=OFF
-
cmake --build ${QDS_CI_JOB_BUILD_PATH} --target aab
Loading