Fix qt5 build and test not overloading == operator
This commit is contained in:
parent
f5c4bd16ac
commit
3a234066ef
@ -424,7 +424,7 @@ bool StateEvaluator::evaluateDescriptor(const StateDescriptor &descriptor) const
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
#else
|
#else
|
||||||
bool res = convertedValue.convert(state.value().type());
|
bool res = descriptorValue.convert(state.value().type());
|
||||||
if (!res) {
|
if (!res) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -48,9 +48,6 @@ public: \
|
|||||||
type##Id(): QUuid() {} \
|
type##Id(): QUuid() {} \
|
||||||
type##Id(const QString &uuidString): QUuid(QAnyStringView(uuidString)) {} \
|
type##Id(const QString &uuidString): QUuid(QAnyStringView(uuidString)) {} \
|
||||||
static type##Id create##type##Id() { return type##Id(QUuid::createUuid()); } \
|
static type##Id create##type##Id() { return type##Id(QUuid::createUuid()); } \
|
||||||
bool operator==(const type##Id &other) const { \
|
|
||||||
return toString() == other.toString(); \
|
|
||||||
} \
|
|
||||||
}; \
|
}; \
|
||||||
Q_DECLARE_METATYPE(type##Id);
|
Q_DECLARE_METATYPE(type##Id);
|
||||||
#else
|
#else
|
||||||
@ -64,7 +61,7 @@ Q_DECLARE_METATYPE(type##Id);
|
|||||||
return toString() == other.toString(); \
|
return toString() == other.toString(); \
|
||||||
} \
|
} \
|
||||||
}; \
|
}; \
|
||||||
Q_DECLARE_METATYPE(type##Id);
|
Q_DECLARE_METATYPE(type##Id);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DECLARE_TYPE_ID(Vendor)
|
DECLARE_TYPE_ID(Vendor)
|
||||||
|
|||||||
Reference in New Issue
Block a user