pick develop/eagle to master#573
Merged
deepin-bot[bot] merged 5 commits intolinuxdeepin:masterfrom Dec 1, 2025
Merged
Conversation
…able Fixed typo in method name across both declaration and implementation to ensure consistent and correct spelling for the device enablement control function. Log: Fix method name spelling error Change-Id: I4f67de86de7fc774495a00fb46cd3eb7c394b128
-- Get battery percentage from DDE. Log: fix issue Bug: https://pms.uniontech.com/bug-view-333825.html
Fixed typos in method name and variable comments to ensure consistent and correct spelling: - Changed parserVendor() to parseVendor() across both declaration and implementation - Fixed "heigth" to "height" in method comments and variable descriptions pick from: linuxdeepin@d3ea819 Log: Fix spelling errors in EDID parser Change-Id: Ia15db2bf96f2e145718981592e69dca3e740172c
-- adjust the code logic to get gpu info. Log: fix issue Bug: https://pms.uniontech.com/bug-view-333969.html
Replaced detailed UFS version parsing (3.0/3.1/4.0) with generic "UFS" identifier when output is non-empty, streamlining interface detection logic. pick from: linuxdeepin@a0b7831 Log: Streamline UFS interface detection Task: https://pms.uniontech.com/task-view-382541.html Change-Id: Ia1a80391d0291e3de69723630ae17029fadd2eb1
lzwind
previously approved these changes
Dec 1, 2025
deepin pr auto review我来对这个git diff进行代码审查:
if (getGpuMemInfoForFTDTM(mapInfo)) {改进建议:
QString DeviceInterface::getGpuInfoByCustom(const QString &cmd, const QStringList &arguments)改进建议:
void DeviceBaseInfo::setCanEnable(bool can)改进建议:
QDBusInterface interface(kPowerService, kPowerPath, kPowerInterface, QDBusConnection::systemBus());改进建议:
m_Interface = "UFS";改进建议:
QString tmpGpuInfo = CommonTools::preGenerateGpuInfo();改进建议:
void EDIDParser::parseVendor()改进建议:
QString CommonTools::preGenerateGpuInfo()
bool CommonTools::getGpuBaseInfo(QMap<QString, QString> &mapInfo)改进建议:
CommonTools::preGenerateGpuInfo();改进建议:
总体建议:
|
lzwind
approved these changes
Dec 1, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: add-uos, lzwind 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
|
/forcemerge |
Contributor
|
This pr force merged! (status: unstable) |
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.
pick develop/eagle to master