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:
x-tools-author 2024-03-26 16:41:10 +08:00
parent 3155c80174
commit 2830bae7cb
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/xToolsCommon.cmake
View File

@ -1,5 +1,5 @@
add_compile_definitions(X_TOOLS_AUTHOR="x-tools-author")
add_compile_definitions(X_TOOL_EDITION="beta1")
add_compile_definitions(X_TOOLS_EDITION="beta1")
add_compile_definitions(X_TOOLS_VERSION="5.1.0")
add_compile_definitions(X_TOOLS_DEFAULT_APP_STYLE="Fusion")
add_compile_definitions(X_TOOLS_CLEAR_MESSAGE_INTERVAL=8000)

2
CMakeLists.txt
View File

@ -26,6 +26,8 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALBUS)
endif()
add_compile_definitions(X_TOOLS_BUILD_WITH_CMAKE)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS})
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS})

5
Source/CANBusStudio/CANBusStudioUI/xToolsCanBusStudioUi.cpp
View File

@ -54,10 +54,7 @@ void xToolsCanBusStudioUi::initUi()
void xToolsCanBusStudioUi::initUiSelectPlugin()
{
ui->pluginComboBox->clear();
QList<QByteArray> plugins = QCanBus::instance()->plugins();
for (const QByteArray& plugin : plugins) {
ui->pluginComboBox->addItem(QString::fromLatin1(plugin));
}
ui->pluginComboBox->addItems(QCanBus::instance()->plugins());
ui->disconnectPushButton->setEnabled(false);
ui->connectPushButton->setEnabled(true);