chore: adapt to qt6 #382
Merged
chore: adapt to qt6 #382
Conversation
This file contains 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
yixinshark
force-pushed
the
chore-qt6
branch
2 times, most recently
from
6e511b2 to
6244149
Compare
18202781743
reviewed
Nov 18, 2024
dde-license-dialog/src/content.cpp
Outdated
| @@ -266,11 +266,15 @@ void Content::updateContent() | |||
| m_acceptCheck->setText(m_isCn ? m_allow : m_enallow); | |||
| m_acceptCheck->setVisible(m_isCn ? !m_allow.isEmpty() : !m_enallow.isEmpty()); | |||
| if (m_hasCn && m_hasEn) { | |||
| trans.load(QString("/usr/share/dde-session-ui/translations/dde-session-ui_%1").arg(m_isCn ? "zh_CN" : "en_US")); | |||
| if (trans.load(QString("/usr/share/dde-session-ui/translations/dde-session-ui_%1").arg(m_isCn ? "zh_CN" : "en_US"))) { | |||
| qApp->installTranslator(&trans); | |||
There was a problem hiding this comment.
是，没有改变原有逻辑，只是修复编译警告。
18202781743
reviewed
Nov 18, 2024
| if (setting.keys().contains("pindialogTimeSec")) | ||
| pinsectime = setting.get("pindialog-time-sec").toUInt(); | ||
| // TODO from deepin-desktop-schemas: /usr/share/glib-2.0/schemas/com.deepin.dde.osd.gschema.xml. | ||
| auto dConfig = Dtk::Core::DConfig::create("org.deepin.dde.osd", "org.deepin.dde.osd", QString(), this); |
There was a problem hiding this comment.
org.deepin.dde.osd 这个配置原来就有的么？有的话，dde-osd没有编译了，是不是有问题了，
There was a problem hiding this comment.
有的，但不是dde-osd项目提供，是deepin-desktop-schemas提供。
18202781743
reviewed
Nov 18, 2024
CMakeLists.txt
Outdated
| set(QT_VERSION_MAJOR 6) | ||
| set(DTK_VERSION_MAJOR 6) | ||
| else() | ||
| set(QT_VERSION_MAJOR 5) |
There was a problem hiding this comment.
如果不打算兼容qt5,可以不加这个，看下面的代码有些也没兼容，
18202781743
reviewed
Nov 18, 2024
| @@ -80,7 +86,7 @@ add_subdirectory("dde-bluetooth-dialog") | |||
| add_subdirectory("dde-hints-dialog") | |||
| add_subdirectory("dde-license-dialog") | |||
| add_subdirectory("dde-lowpower") | |||
| add_subdirectory("dde-osd") | |||
| #add_subdirectory("dde-osd") | |||
There was a problem hiding this comment.
这个还是要适配，在社区版的x11下面还是需要的，
There was a problem hiding this comment.
v23走release分支，此修改不会合并到release分支。
yixinshark
force-pushed
the
chore-qt6
branch
2 times, most recently
from
6f957db to
0a4613b
Compare
18202781743
previously approved these changes
Nov 18, 2024
1.adapt to qt6 2.change gsettings to dconfig 3.Resolve compilation warnings Log: as title Task: https://pms.uniontech.com/task-view-367947.html
yixinshark
force-pushed
the
chore-qt6
branch
from
0a4613b to
27e3eda
Compare
18202781743
approved these changes
Nov 19, 2024
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, yixinshark 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 |
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.
1.adapt to qt6
2.change gsettings to dconfig
3.Resolve compilation warnings
Log: as title
Task: https://pms.uniontech.com/task-view-367947.html