AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed conflicts after merge

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-28 22:03:28 +03:00
parent 36a2482165
commit 8f6aa950cd
6 changed files with 140 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/amnezia_application.cpp
View file

@ -21,8 +21,8 @@
#include "protocols/qml_register_protocols.h"
#if defined(Q_OS_IOS)
#include "platforms/ios/QtAppDelegate-C-Interface.h"
#include "platforms/ios/ios_controller.h"
#include "platforms/ios/QtAppDelegate-C-Interface.h"
#include "platforms/ios/ios_controller.h"
#endif
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@ -108,6 +108,9 @@ void AmneziaApplication::init()
&ImportController::extractConfigFromData);
connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_pageController.get(),
&PageController::goToPageViewConfig);
#endif
#ifdef Q_OS_IOS
IosController::Instance()->initialize();
#endif