Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions deepin-devicemanager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ endif ()
execute_process(COMMAND cat /etc/os-version OUTPUT_VARIABLE OS_INFO_STR)
string(REGEX MATCHALL "MajorVersion=[0-9]+" MAJOR_STR "${OS_INFO_STR}")
string(REGEX MATCH "[0-9]+" MAJOR_VERSION "${MAJOR_STR}")
message("---------------------")
message("${OS_INFO_STR}")
message("---------------------")
if (MAJOR_VERSION MATCHES "23")
message("--------------------- OS_BUILD_V23 on")
add_definitions(-DOS_BUILD_V23)
Expand Down
1 change: 0 additions & 1 deletion deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ void DeviceBluetooth::setInfoFromHciconfig(const QMap<QString, QString> &mapInfo
setAttribute(mapInfo, "Name", m_Name, false);
setAttribute(mapInfo, "Alias", m_Alias);
setAttribute(mapInfo, "Manufacturer", m_Vendor);
setAttribute(mapInfo, "HCI Version", m_Version, true);

// 获取设备其他信息
getOtherMapInfo(mapInfo);
Expand Down