Skip to content
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.

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

feat: adapt for Qt 6.8 #116

Merged
merged 1 commit into from
Dec 26, 2024
Merged

Conversation

JWWTSL
Copy link

@JWWTSL JWWTSL commented Nov 19, 2024

Adaptation work based on Qt 6.8, modified relevant interfaces and configuration files.

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: JWWTSL

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot
Copy link

Hi @JWWTSL. Thanks for your PR. 😃

@deepin-ci-robot
Copy link

Hi @JWWTSL. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@JWWTSL JWWTSL force-pushed the develop/qt6.8 branch 6 times, most recently from 200a9ed to 48c98db Compare December 26, 2024 06:58
debian/control Outdated Show resolved Hide resolved
src/application.cpp Outdated Show resolved Hide resolved
src/application.cpp Outdated Show resolved Hide resolved
@JWWTSL JWWTSL force-pushed the develop/qt6.8 branch 2 times, most recently from cb36693 to 4709855 Compare December 26, 2024 08:06
Adaptation work based on Qt 6.8, modified relevant
interfaces and configuration files.
@JWWTSL
Copy link
Author

JWWTSL commented Dec 26, 2024

/merge

@deepin-bot deepin-bot bot merged commit 37c80a6 into linuxdeepin:develop/qt6.8 Dec 26, 2024
13 checks passed
// if (page()->currentTool_p() != nullptr && drawScene() != nullptr) {
// auto e = CDrawToolEvent::fromQEvent_single(event, drawScene());
// page()->currentTool_p()->enterEvent(&e);
// }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

无用代码移除

@@ -569,7 +585,7 @@ void PageView::initContextMenuConnection()
qreal space_height = (scence_BR.height() - sum_items_height)
/ (allitems.size() - 1);

// [6] 按照y值进行移动位置
// [6] 按照y值��行移动位置
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

编码问题?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants