Merge remote-tracking branch 'origin/dev' into ios-wireguard

This commit is contained in:
Alex Kh
2022-02-15 10:55:45 +04:00
118 changed files with 2135 additions and 981 deletions
+5 -1
View File
@@ -149,7 +149,11 @@ bool ContainerProps::isWorkingOnPlatform(DockerContainer c)
default: return false;
}
#elif defined (Q_OS_MAC)
return false;
switch (c) {
case DockerContainer::WireGuard: return false;
case DockerContainer::Ipsec: return false;
default: return true;
}
#elif defined (Q_OS_ANDROID)
switch (c) {