diff --git a/CMakeLists.txt b/CMakeLists.txt index a62f3c2f..d3948416 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,8 +102,10 @@ macro(sak_import_module src_dir_name) endif() endmacro() -sak_import_module("canbusstudio") -sak_import_module("modbusstudio") +if(NOT Qt6_VERSION VERSION_LESS "6.5.0") + sak_import_module("canbusstudio") + sak_import_module("modbusstudio") +endif() # QtSwissArmyKnife) include_directories(src) @@ -137,15 +139,16 @@ if(APP_EABLE_ASSISTANTS) add_subdirectory(${CMAKE_SOURCE_DIR}/src/assistants) endif() +if(NOT Qt6_VERSION VERSION_LESS "6.5.0") option(APP_EABLE_CANBUSSTUDIO "Enable to build CANBusStudio." ON) if(APP_EABLE_CANBUSSTUDIO) add_subdirectory(${CMAKE_SOURCE_DIR}/src/canbusstudio) endif() - option(APP_EABLE_MODBUSSTUDIO "Enable to build ModbusStudio." ON) if(APP_EABLE_MODBUSSTUDIO) add_subdirectory(${CMAKE_SOURCE_DIR}/src/modbusstudio) endif() +endif() # For Qt6.4 and later. if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR GREATER_EQUAL 4) diff --git a/src/sakmainwindow.cc b/src/sakmainwindow.cc index e56e82ff..d5a23c94 100644 --- a/src/sakmainwindow.cc +++ b/src/sakmainwindow.cc @@ -112,7 +112,7 @@ SAKMainWindow::SAKMainWindow(QWidget* parent) QString title = QString("Qt Swiss Army Knife"); #ifndef SAK_IMPORT_MODULE_PRIVATE - QString title = tr("(Community)"); + title.append(tr("(Community)")); #endif title.append(QString(" ")); title.append(QString("v"));