forked from qt-creator/qt-creator
unittest: Fix build on macOS
We are still using our own Utils::variant and corresponding functions
on macOS.
Amends 90cc7fed3b
Change-Id: I829bdd3a4cc03f994a825ee3a962d4eb523a3bf1
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
@@ -82,7 +82,7 @@ MATCHER_P5(IsStorageType,
|
|||||||
|
|
||||||
return type.importId == importId && type.typeName == typeName
|
return type.importId == importId && type.typeName == typeName
|
||||||
&& type.accessSemantics == accessSemantics && type.sourceId == sourceId
|
&& type.accessSemantics == accessSemantics && type.sourceId == sourceId
|
||||||
&& std::visit([&](auto &&v) -> bool { return v.name == prototype.name; }, type.prototype);
|
&& Utils::visit([&](auto &&v) -> bool { return v.name == prototype.name; }, type.prototype);
|
||||||
}
|
}
|
||||||
|
|
||||||
MATCHER_P4(IsStorageTypeWithInvalidSourceId,
|
MATCHER_P4(IsStorageTypeWithInvalidSourceId,
|
||||||
@@ -118,7 +118,7 @@ MATCHER_P3(IsPropertyDeclaration,
|
|||||||
const Storage::PropertyDeclaration &propertyDeclaration = arg;
|
const Storage::PropertyDeclaration &propertyDeclaration = arg;
|
||||||
|
|
||||||
return propertyDeclaration.name == name
|
return propertyDeclaration.name == name
|
||||||
&& std::visit([&](auto &&v) -> bool { return v.name == typeName.name; },
|
&& Utils::visit([&](auto &&v) -> bool { return v.name == typeName.name; },
|
||||||
propertyDeclaration.typeName)
|
propertyDeclaration.typeName)
|
||||||
&& propertyDeclaration.traits == traits;
|
&& propertyDeclaration.traits == traits;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user