Merge branch 'dev' into ikev2_fix_window_api_signal

This commit is contained in:
pokamest 2021-10-26 00:02:14 +03:00
commit 1b1a5be607
344 changed files with 182435 additions and 13254 deletions

View file

@ -122,6 +122,7 @@ int main(int argc, char *argv[])
qRegisterMetaType<Protocol>("Protocol");
qRegisterMetaType<ServiceType>("ServiceType");
qRegisterMetaType<Page>("Page");
qRegisterMetaType<VpnProtocol::ConnectionState>("ConnectionState");
qRegisterMetaType<PageProtocolLogicBase *>("PageProtocolLogicBase *");