Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
+2
-2
@@ -22,7 +22,7 @@ variables:
|
||||
BUILD_IMAGE: 'asset-repository.sf.defence-elec.de/docker-rme/livesim/guez'
|
||||
CHECKOUT_IMAGE: 'asset-repository.sf.defence-elec.de/docker-local/docker/docker:git'
|
||||
ARTIFACTORY: 'http://asset-repository.sf.defence-elec.de:80/artifactory'
|
||||
ARTIFACTORY_PATH: 'generic-rme/livesim/guez/master'
|
||||
ARTIFACTORY_PATH: 'generic-rme/livesim/guez/dlbo'
|
||||
RUNNER_TAG: ''
|
||||
|
||||
stages:
|
||||
@@ -77,7 +77,7 @@ build:
|
||||
variables:
|
||||
BUILD_VERSION: $VERSION
|
||||
VERSION_DATE: $CI_COMMIT_TIMESTAMP
|
||||
PROJECT_BASE_DIR: /builds/projects-domain-live/guez/legatus
|
||||
PROJECT_BASE_DIR: /builds/projects-domain-live/guez/dlbo/legatus
|
||||
EMERGE_VERBOSE: 1 # Verbosity level 0:warning 1:info 2:debug
|
||||
script:
|
||||
- export BUILD_NUMBER=$(date +%Y%m%d%H)
|
||||
|
||||
Reference in new issue
Block a user