Merge remote-tracking branch 'origin/dev' into ios-wireguard
This commit is contained in:
commit
e1293c2c74
118 changed files with 2135 additions and 981 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue