fix: [build] build error#336
Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:release/eaglefrom Dec 22, 2025
Merged
Conversation
Log: as title
Reviewer's guide (collapsed on small PRs)Reviewer's GuideAdjusts the DTK version range used to detect the customized watermark interface so that builds succeed with newer DTK versions while keeping behavior consistent with documentation. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
da62671 to
09b6f3f
Compare
max-lvs
approved these changes
Dec 22, 2025
deepin pr auto review我来对这个diff进行仔细分析:
改进建议:
// 因此,判断定制线:存在水印接口,版本不低于 5.4.42.7 且低于主线水印接口引入版本 5.6.9
#define WATERMARK_INTERFACE_VERSION_MIN DTK_VERSION_CHECK(5, 4, 42, 7)
#define WATERMARK_INTERFACE_VERSION_MAX DTK_VERSION_CHECK(5, 6, 9, 0)
#if WATERMARK_INTERFACE_VERSION_MIN <= DTK_VERSION && DTK_VERSION < WATERMARK_INTERFACE_VERSION_MAX
#if WATERMARK_INTERFACE_VERSION_MIN <= DTK_VERSION && DTK_VERSION < WATERMARK_INTERFACE_VERSION_MAX
qDebug() << "Using custom watermark interface";
#else
qDebug() << "Using mainline watermark interface";
#endif总的来说,这是一个合理的版本兼容性修改,主要是为了适配DTK框架的水印接口变更。修改后的代码能够更好地支持不同版本的DTK框架。 |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: LiHua000, max-lvs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/merge |
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.
Log: as title
Summary by Sourcery
Bug Fixes: