From e4a4255fe4b1418bf49c33bd0b40001d2080a084 Mon Sep 17 00:00:00 2001 From: Emeric Date: Fri, 26 Jul 2024 18:13:32 +0200 Subject: [PATCH] Build with Qt 6.7.2, fix CMake build file --- .github/workflows/builds_desktop.yml | 2 +- .github/workflows/builds_mobile.yml | 2 +- CMakeLists.txt | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml index 98acf445..eb9bf8e6 100644 --- a/.github/workflows/builds_desktop.yml +++ b/.github/workflows/builds_desktop.yml @@ -15,7 +15,7 @@ on: env: APP_NAME: "WatchFlower" APP_VERSION: "6.0" - QT_VERSION: "6.6.3" + QT_VERSION: "6.7.2" #------------------------------------------------------------------------------- # Workflow jobs diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml index 764bc2dd..b6798e06 100644 --- a/.github/workflows/builds_mobile.yml +++ b/.github/workflows/builds_mobile.yml @@ -15,7 +15,7 @@ on: env: APP_NAME: "WatchFlower" APP_VERSION: "6.0" - QT_VERSION: "6.6.3" + QT_VERSION: "6.7.2" #------------------------------------------------------------------------------- # Workflow jobs diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7d7f89..05d51ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,10 +75,11 @@ set(SOURCES src/devices/device_ess_generic.cpp src/devices/device_ess_generic.h src/thirdparty/RC4/rc4.cpp src/thirdparty/RC4/rc4.h src/main.cpp - qml/qml.qrc - qml/components.qrc i18n/i18n.qrc + qml/qml.qrc + qml/ComponentLibrary/ComponentLibrary.qrc assets/assets.qrc + assets/icons.qrc assets/devices.qrc assets/plants.qrc )