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: do something make old qt version happy

Browse Source
This commit is contained in:
x-tools-author 2024-03-25 14:37:45 +08:00
parent 9b5d95f70c
commit 50a2f4b572
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -117,7 +117,11 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileCheck/Source)
# -------------------------------------------------------------------------------------------------
# Modbus module
option(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO "Enable Modbus Studio module" ON)
if(NOT Qt${QT_VERSION_MAJOR}_VERSION VERSION_LESS "6.5.0")
option(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO "Enable Modbus Studio module" ON)
else()
option(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO "Enable Modbus Studio module" OFF)
endif()
if(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO)
file(GLOB_RECURSE X_TOOLS_MODBUS_STUDIO_H "${CMAKE_SOURCE_DIR}/Source/ModbusStudio/*.h")
file(GLOB_RECURSE X_TOOLS_MODBUS_STUDIO_UI "${CMAKE_SOURCE_DIR}/Source/ModbusStudio/*.ui")
@ -133,6 +137,7 @@ endif()
# -------------------------------------------------------------------------------------------------
# CAN bus module
option(X_TOOLS_IMPORT_MODULE_CANBUS_STUDIO "Enable CAN Bus module" ON)
if(X_TOOLS_IMPORT_MODULE_CANBUS_STUDIO)
file(GLOB_RECURSE X_TOOLS_CANBUS_STUDIO_H "${CMAKE_SOURCE_DIR}/Source/CANBusStudio/*.h")

2
Source/MainWindow.cpp
View File

@ -178,7 +178,7 @@ void MainWindow::initFileMenu()
#ifdef X_TOOLS_IMPORT_MODULE_CANBUS_STUDIO
QAction* canbusAction = new QAction("CANBus Studio", this);
connect(canbusAction, &QAction::triggered, this, [=]() {
xToolsModbusStudioUi* w = new xToolsModbusStudioUi();
xToolsCanBusStudioUi* w = new xToolsCanBusStudioUi();
w->setContentsMargins(9, 9, 9, 9);
w->setAttribute(Qt::WA_DeleteOnClose, true);
w->resize(1024, 480);

3
Source/ModbusStudio/ModbusStudioUI/xToolsModbusStudioUi.ui
View File

@ -537,9 +537,6 @@
<property name="editable">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>pdu(no server address, no crc, such read 2 coils: 01 00 00 00 01)</string>
</property>
</widget>
</item>
<item>