From 77a83e4fc323441be4121be81a0ef70bf9f831fd Mon Sep 17 00:00:00 2001 From: Igor Sorokin Date: Wed, 14 Feb 2024 17:46:36 +0300 Subject: [PATCH] Additional setup for Qt Charts --- README.md | 1 + client/CMakeLists.txt | 1 + client/amnezia_application.h | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88ec574c4..2e090b122 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ Look deploy folder for build scripts. - Qt 5 Compatibility Module - Qt Shader Tools - Additional Libraries: + - Qt Charts - Qt Image Formats - Qt Multimedia - Qt Remote Objects diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 0bc4e89c1..6ab70147a 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -30,6 +30,7 @@ set(LIBS ${LIBS} Qt6::Network Qt6::Xml Qt6::RemoteObjects Qt6::Quick Qt6::Svg Qt6::QuickControls2 Qt6::Core5Compat Qt6::Concurrent + Qt6::Charts ) if(IOS) diff --git a/client/amnezia_application.h b/client/amnezia_application.h index 52427281f..f7f75656d 100644 --- a/client/amnezia_application.h +++ b/client/amnezia_application.h @@ -5,7 +5,7 @@ #include #include #include -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(Q_OS_ANDROID) #include #else #include @@ -44,8 +44,10 @@ #define amnApp (static_cast(QCoreApplication::instance())) -#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +#if defined(Q_OS_ANDROID) #define AMNEZIA_BASE_CLASS QGuiApplication +#elif defined(Q_OS_IOS) + #define AMNEZIA_BASE_CLASS QApplication #else #define AMNEZIA_BASE_CLASS SingleApplication #define QAPPLICATION_CLASS QApplication