TheLanc3/QDiskInfo
1
0
Fork 0
mirror of https://github.com/edisionnano/QDiskInfo.git synced 2026-04-19 01:41:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Build using Qt6

Browse Source
This commit is contained in:
Spiros
2024-06-11 19:03:29 +03:00
parent 183da80ce2
commit e96db9d383
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.16)
project(KDiskInfo VERSION 0.1 LANGUAGES CXX) project(KDiskInfo VERSION 0.1 LANGUAGES CXX)
@@ -9,7 +9,6 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
set(PROJECT_SOURCES set(PROJECT_SOURCES
@@ -17,6 +16,13 @@ set(PROJECT_SOURCES
mainwindow.cpp mainwindow.cpp
mainwindow.h mainwindow.h
mainwindow.ui mainwindow.ui
custombutton.h
custombutton.cpp
statusdot.h
statusdot.cpp
jsonparser.h
jsonparser.cpp
resources.qrc
) )
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
@@ -38,11 +44,6 @@ else()
else() else()
add_executable(KDiskInfo add_executable(KDiskInfo
${PROJECT_SOURCES} ${PROJECT_SOURCES}
custombutton.h custombutton.cpp
statusdot.h statusdot.cpp
jsonparser.h jsonparser.cpp
resources.qrc
) )
endif() endif()
endif() endif()
@@ -52,9 +53,7 @@ target_link_libraries(KDiskInfo PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
# If you are developing for iOS or macOS you should consider setting an # If you are developing for iOS or macOS you should consider setting an
# explicit, fixed bundle identifier manually though. # explicit, fixed bundle identifier manually though.
if(${QT_VERSION} VERSION_LESS 6.1.0)
set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.KDiskInfo)
endif()
set_target_properties(KDiskInfo PROPERTIES set_target_properties(KDiskInfo PROPERTIES
${BUNDLE_ID_OPTION} ${BUNDLE_ID_OPTION}
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
@@ -73,3 +72,5 @@ install(TARGETS KDiskInfo
if(QT_VERSION_MAJOR EQUAL 6) if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(KDiskInfo) qt_finalize_executable(KDiskInfo)
endif() endif()
include(FeatureSummary)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

2
mainwindow.cpp
View File

@@ -106,7 +106,7 @@ void MainWindow::scanDevices()
devices = jsonObj["devices"].toArray(); devices = jsonObj["devices"].toArray();
QStringList commandList; QStringList commandList;
for (const QJsonValue &value : qAsConst(devices)) { for (const QJsonValue &value : std::as_const(devices)) {
QJsonObject device = value.toObject(); QJsonObject device = value.toObject();
QString deviceName = device["name"].toString(); QString deviceName = device["name"].toString();
commandList.append(QString("smartctl --all --json %1").arg(deviceName)); commandList.append(QString("smartctl --all --json %1").arg(deviceName));