andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'feature/graphview' of github.com:amnezia-vpn/amnezia-client into feature/graphview

Browse Source
This commit is contained in:
agalehaga
2024-02-18 12:28:35 +02:00
parent a6467dd0f0 c2d204b362
commit 77e82fbf40
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1
View File
@@ -55,6 +55,7 @@ Look deploy folder for build scripts.
- Qt 5 Compatibility Module - Qt 5 Compatibility Module
- Qt Shader Tools - Qt Shader Tools
- Additional Libraries: - Additional Libraries:
- Qt Charts
- Qt Image Formats - Qt Image Formats
- Qt Multimedia - Qt Multimedia
- Qt Remote Objects - Qt Remote Objects
client/CMakeLists.txt
+1
View File
@@ -30,6 +30,7 @@ set(LIBS ${LIBS}
Qt6::Network Qt6::Xml Qt6::RemoteObjects Qt6::Network Qt6::Xml Qt6::RemoteObjects
Qt6::Quick Qt6::Svg Qt6::QuickControls2 Qt6::Quick Qt6::Svg Qt6::QuickControls2
Qt6::Core5Compat Qt6::Concurrent Qt6::Core5Compat Qt6::Concurrent
Qt6::Charts
) )
if(IOS) if(IOS)
client/amnezia_application.h
+4 -2
View File
@@ -5,7 +5,7 @@
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QQmlContext> #include <QQmlContext>
#include <QThread> #include <QThread>
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) #if defined(Q_OS_ANDROID)
#include <QGuiApplication> #include <QGuiApplication>
#else #else
#include <QApplication> #include <QApplication>
@@ -44,8 +44,10 @@
#define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance())) #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) #if defined(Q_OS_ANDROID)
#define AMNEZIA_BASE_CLASS QGuiApplication #define AMNEZIA_BASE_CLASS QGuiApplication
#elif defined(Q_OS_IOS)
#define AMNEZIA_BASE_CLASS QApplication
#else #else
#define AMNEZIA_BASE_CLASS SingleApplication #define AMNEZIA_BASE_CLASS SingleApplication
#define QAPPLICATION_CLASS QApplication #define QAPPLICATION_CLASS QApplication