更新版本。
This commit is contained in:
parent
1277ef7495
commit
5e24a831ae
@ -82,7 +82,7 @@ void Application::initializeLogger() {
|
||||
int Application::exec() {
|
||||
QQmlApplicationEngine engine;
|
||||
engine.addImageProvider("videoframe", m_videoFrameProvider);
|
||||
const QUrl url(QStringLiteral("qrc:/Analyser/qml/main.qml"));
|
||||
const QUrl url(QStringLiteral("qrc:/qt/qml/Analyser/qml/Main.qml"));
|
||||
QObject::connect(
|
||||
&engine, &QQmlApplicationEngine::objectCreationFailed, m_app.get(), []() { QCoreApplication::exit(-1); },
|
||||
Qt::QueuedConnection);
|
||||
|
@ -1,12 +1,11 @@
|
||||
project(Analyser VERSION 0.3 LANGUAGES C CXX)
|
||||
set(APPLICATION_NAME "掌静脉测试工具")
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick QuickTemplates2 Widgets SerialPort JpegPrivate BundledLibjpeg)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick QuickTemplates2 Widgets SerialPort JpegPrivate BundledLibjpeg)
|
||||
|
||||
qt_standard_project_setup(REQUIRES 6.5)
|
||||
|
||||
configure_file(Configuration.h.in Configuration.h)
|
||||
|
||||
add_executable(Analyser Analyser.rc
|
||||
@ -25,7 +24,7 @@ qt_add_qml_module(Analyser
|
||||
URI Analyser
|
||||
VERSION 1.0
|
||||
QML_FILES
|
||||
qml/main.qml
|
||||
qml/Main.qml
|
||||
qml/ConnectionItem.qml
|
||||
qml/OperationItem.qml
|
||||
qml/StatusTip.qml
|
||||
@ -55,7 +54,8 @@ target_link_directories(Analyser
|
||||
)
|
||||
|
||||
target_link_libraries(Analyser
|
||||
PRIVATE QtComponets
|
||||
PRIVATE Fluent
|
||||
PRIVATE Fluentplugin
|
||||
PRIVATE Encrypt
|
||||
PRIVATE Database
|
||||
PRIVATE Ws2_32
|
||||
|
@ -156,6 +156,7 @@ Item {
|
||||
}
|
||||
GroupBox {
|
||||
title: "图片注册"
|
||||
visible: true
|
||||
GridLayout {
|
||||
columns: 2
|
||||
TextField {
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
cmake_minimum_required(VERSION 3.29)
|
||||
|
||||
project(SmartLockerTools VERSION 0.1 LANGUAGES C CXX)
|
||||
|
||||
@ -27,7 +27,7 @@ execute_process(
|
||||
|
||||
add_subdirectory(${Projects_ROOT}/Kylin/Universal Universal)
|
||||
add_subdirectory(${Projects_ROOT}/Kylin/Encrypt Encrypt)
|
||||
add_subdirectory(${Projects_ROOT}/Kylin/QtComponets QtComponets)
|
||||
add_subdirectory(${Projects_ROOT}/Kylin/Fluent Fluent)
|
||||
|
||||
add_subdirectory(Peripheral)
|
||||
add_subdirectory(Database)
|
||||
|
@ -61,7 +61,7 @@ HOST_TOOLS := /opt/Xuantie-900-gcc-elf-newlib-x86_64-V2.6.1/bin
|
||||
|
||||
# 编译OTA固件,11为OTA版本号,这个版本号只做固件文件名显示。
|
||||
# 实际的版本设置在 cv181x_alios/solutions/smart_doorbell/package.yaml.L015_V200R002
|
||||
./rebuild-app-ota.sh y L015 V200 R002 01
|
||||
./rebuild-app-ota.sh y L015 V200 R002 02
|
||||
600X800
|
||||
```
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user