Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui
This commit is contained in:
commit
7fc4ea0c68
12 changed files with 35 additions and 29 deletions
|
@ -21,7 +21,6 @@
|
|||
#include "protocols/qml_register_protocols.h"
|
||||
|
||||
#if defined(Q_OS_IOS)
|
||||
#include "platforms/ios/QtAppDelegate-C-Interface.h"
|
||||
#include "platforms/ios/ios_controller.h"
|
||||
#endif
|
||||
|
||||
|
@ -112,6 +111,10 @@ void AmneziaApplication::init()
|
|||
|
||||
#ifdef Q_OS_IOS
|
||||
IosController::Instance()->initialize();
|
||||
connect(IosController::Instance(), &IosController::importConfigFromOutside, m_importController.get(),
|
||||
&ImportController::extractConfigFromData);
|
||||
connect(IosController::Instance(), &IosController::importConfigFromOutside, m_pageController.get(),
|
||||
&PageController::goToPageViewConfig);
|
||||
#endif
|
||||
|
||||
m_notificationHandler.reset(NotificationHandler::create(nullptr));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue