software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update files of project

Browse Source
This commit is contained in:
wuhai 2023-11-20 17:25:00 +08:00
parent ac1c98d8bc
commit 36a375ef19
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -102,8 +102,10 @@ macro(sak_import_module src_dir_name)
endif() endif()
endmacro() endmacro()
sak_import_module("canbusstudio") if(NOT Qt6_VERSION VERSION_LESS "6.5.0")
sak_import_module("modbusstudio") sak_import_module("canbusstudio")
sak_import_module("modbusstudio")
endif()
# QtSwissArmyKnife) # QtSwissArmyKnife)
include_directories(src) include_directories(src)
@ -137,15 +139,16 @@ if(APP_EABLE_ASSISTANTS)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/assistants) add_subdirectory(${CMAKE_SOURCE_DIR}/src/assistants)
endif() endif()
if(NOT Qt6_VERSION VERSION_LESS "6.5.0")
option(APP_EABLE_CANBUSSTUDIO "Enable to build CANBusStudio." ON) option(APP_EABLE_CANBUSSTUDIO "Enable to build CANBusStudio." ON)
if(APP_EABLE_CANBUSSTUDIO) if(APP_EABLE_CANBUSSTUDIO)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/canbusstudio) add_subdirectory(${CMAKE_SOURCE_DIR}/src/canbusstudio)
endif() endif()
option(APP_EABLE_MODBUSSTUDIO "Enable to build ModbusStudio." ON) option(APP_EABLE_MODBUSSTUDIO "Enable to build ModbusStudio." ON)
if(APP_EABLE_MODBUSSTUDIO) if(APP_EABLE_MODBUSSTUDIO)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/modbusstudio) add_subdirectory(${CMAKE_SOURCE_DIR}/src/modbusstudio)
endif() endif()
endif()
# For Qt6.4 and later. # For Qt6.4 and later.
if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR GREATER_EQUAL 4) if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR GREATER_EQUAL 4)

2
src/sakmainwindow.cc
View File

@ -112,7 +112,7 @@ SAKMainWindow::SAKMainWindow(QWidget* parent)
QString title = QString("Qt Swiss Army Knife"); QString title = QString("Qt Swiss Army Knife");
#ifndef SAK_IMPORT_MODULE_PRIVATE #ifndef SAK_IMPORT_MODULE_PRIVATE
QString title = tr("(Community)"); title.append(tr("(Community)"));
#endif #endif
title.append(QString(" ")); title.append(QString(" "));
title.append(QString("v")); title.append(QString("v"));