Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

This commit is contained in:
vladimir.kuznetsov 2023-07-18 05:36:17 +03:00
commit 5b8a0881b7
180 changed files with 5446 additions and 3661 deletions

View file

@ -3,7 +3,7 @@
#include <QDebug>
#include <QObject>
#include <QQmlEngine>
#include <QMetaEnum>
namespace amnezia
{
@ -207,19 +207,6 @@ namespace amnezia
Q_INVOKABLE static QString key_proto_config_data(Proto p);
Q_INVOKABLE static QString key_proto_config_path(Proto p);
};
static void declareQmlProtocolEnum()
{
qmlRegisterUncreatableMetaObject(ProtocolEnumNS::staticMetaObject, "ProtocolEnum", 1, 0, "ProtocolEnum",
"Error: only enums");
qmlRegisterUncreatableMetaObject(ProtocolEnumNS::staticMetaObject, "ProtocolEnum", 1, 0, "TransportProto",
"Error: only enums");
qmlRegisterUncreatableMetaObject(ProtocolEnumNS::staticMetaObject, "ProtocolEnum", 1, 0, "ServiceType",
"Error: only enums");
}
} // namespace amnezia
QDebug operator<<(QDebug debug, const amnezia::Proto &p);