Merge branch 'master' into shareddata

This commit is contained in:
Matthias Kollmann
2017-10-19 20:43:00 +02:00
8 changed files with 115 additions and 17 deletions

View File

@ -141,7 +141,7 @@ bool QZeroConfService::isValid() const
bool QZeroConfService::operator==(const QZeroConfService &rhs) const
{
return this->name() == rhs.name() && this->ip() == rhs.ip() && this->ipv6() == rhs.ipv6();
return this->name() == rhs.name() && (this->ip() == rhs.ip() || this->ipv6() == rhs.ipv6());
}