feat: port TagTracker custom overlay to current upstream and drop Herelink - #110
Merged
Merged
Conversation
…elink Brings the custom/ overlay and CI up to the upstream qgroundcontrol master merged in the parent commit. Custom overlay - Replace .qrc/exclusion resource machinery with qt_add_resources + qt_add_qml_module (QGroundControl.CustomControls) per the new custom-build contract (CUSTOM_SOURCES/LIBRARIES/INCLUDE_DIRECTORIES/DEFINITIONS) - Add CustomOverrideInterceptor so qrc:/qml/<path> resolves to the custom override under /Custom/qml when one exists - Update QML imports for renamed/removed upstream modules and drop version numbers State machine - Rebase CustomState/CustomStateMachine on upstream QGCState/QGCStateMachine - Remove duplicated DelayState/FunctionState/SendMavlinkCommandState in favour of the upstream implementations Settings - Register CustomSettings through QGCCorePlugin::registerCustomSettings and expose it as settingsManager.customSettings - Add the TagTracker settings page via the SettingsPages.json overlay - Add required label metadata to Custom.SettingsGroup.json Behaviour moved out of upstream files into supported hooks - Default-enable CustomPluginLog in CustomPlugin::init() - EMERGENCY STOP as a toolbar indicator instead of a FlyViewToolBar patch Removed - Herelink core plugin/options and the TAG_TRACKER_HERELINK_BUILD conditionals - Stale custom/android manifest and build.gradle overlay (upstream now covers it) - tunnel-protocol git submodule; fetched via CPMAddPackage instead CI - Rewrite macOS and Android workflows on the upstream composite actions, artifacts via upload-artifact, no S3/attestation/Play Store - Trigger on sync-upstream-master; cancel-in-progress only for pull requests Refs mavlink/qgroundcontrol#15026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ports the
custom/overlay and CI to the upstream qgroundcontrol master merged in thesync-upstream-masterbaseline commit, and drops Herelink support. The baseline branch does not build on its own; this PR is what makes it build.The diff touches only fork-owned paths:
custom/,.github/,.gitmodules,README.md. Zero changes to upstream files.Custom overlay
.qrc/exclusion resource machinery withqt_add_resources+qt_add_qml_module(QGroundControl.CustomControls) per the new custom-build contract (CUSTOM_SOURCES/LIBRARIES/INCLUDE_DIRECTORIES/DEFINITIONS)CustomOverrideInterceptorsoqrc:/qml/<path>resolves to the custom override under/Custom/qmlwhen one existsState machine
CustomState/CustomStateMachineon upstreamQGCState/QGCStateMachineDelayState/FunctionState/SendMavlinkCommandStatein favour of the upstream implementationsSettings
CustomSettingsthroughQGCCorePlugin::registerCustomSettingsand expose it assettingsManager.customSettingsSettingsPages.jsonoverlaylabelmetadata toCustom.SettingsGroup.jsonBehaviour moved out of upstream files into supported hooks
CustomPluginLoginCustomPlugin::init()FlyViewToolBarpatchRemoved
TAG_TRACKER_HERELINK_BUILDconditionalscustom/androidmanifest andbuild.gradleoverlay (upstream now covers it)tunnel-protocolgit submodule; fetched viaCPMAddPackageinsteadCI
upload-artifact, no S3/attestation/Play Storesync-upstream-master; cancel-in-progress only for pull requests.githubline count is upstream'sactions/+scripts/brought in verbatim because the new workflows depend on themNot yet done
ctesthas not been runRefs mavlink/qgroundcontrol#15026