diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-04 09:35:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-04 09:35:28 +0200 |
| commit | 1325205a64904109de1c91c1b4b90df830d60141 (patch) | |
| tree | c0cb347fe1fc02faaa4291089d4ef959bac21e97 | |
| parent | eaffef633e98e2ea94acf5fd0e1a10676591bfa8 (diff) | |
| parent | f9a1c4a18a3421617e28d2c26d30b011d22a0229 (diff) | |
| download | qtlocation-1325205a64904109de1c91c1b4b90df830d60141.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/imports/locationlabs/locationlabs.cpp
Change-Id: I362b903966b5087022fd125b511b236323c265ed
| -rw-r--r-- | src/location/places/qplacecategory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/location/places/qplacecategory.cpp b/src/location/places/qplacecategory.cpp index 5629631a..64a75167 100644 --- a/src/location/places/qplacecategory.cpp +++ b/src/location/places/qplacecategory.cpp @@ -139,7 +139,9 @@ bool QPlaceCategory::operator==(const QPlaceCategory &other) const { return d->categoryId == other.d->categoryId && d->name == other.d->name && - d->visibility == other.d->visibility && + (d->visibility == QLocation::UnspecifiedVisibility || + other.d->visibility == QLocation::UnspecifiedVisibility || + d->visibility == other.d->visibility) && d->icon == other.d->icon; } |