Skip to content

fix: [build] build error #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Dec 22, 2025
Merged

fix: [build] build error #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ void showWatermark(const QString &sJson, MainWindow *w)
WaterMarkData data = ins->data();
// DTKWidget 主线和定制线的水印接口不同，通过版本进行区分
// 主线水印接口在 5.6.9 之后引入.
// 因此，判断定制线：存在水印接口，版本不低于 5.4.42.7 且低于 5.5
#if DTK_VERSION_CHECK(5, 4, 42, 7) <= DTK_VERSION && DTK_VERSION < DTK_VERSION_CHECK(5, 5, 0, 0)
// 因此，判断定制线：存在水印接口，版本不低于 5.4.42.7 且低于 5.6.9
#if DTK_VERSION_CHECK(5, 4, 42, 7) <= DTK_VERSION && DTK_VERSION < DTK_VERSION_CHECK(5, 6, 9, 0)
//接口变动为结构体
data.text = mapwaterMark.value("text").toString();
data.type = WaterMarkType::Text;
Expand Down