diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index 2162512883a..c6ab3b1c483 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -1267,8 +1267,8 @@ public: template void copyAppend(It b, It e, QtPrivate::IfIsForwardIterator = true, - QtPrivate::IfIsNotSame, iterator> = true, - QtPrivate::IfIsNotSame, const_iterator> = true) + QtPrivate::IfIsNotConvertible = true, + QtPrivate::IfIsNotConvertible = true) { Q_ASSERT(this->isMutable() || b == e); Q_ASSERT(!this->isShared() || b == e); diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h index 0f9225e461c..f4dfecffcec 100644 --- a/src/corelib/tools/qcontainertools_impl.h +++ b/src/corelib/tools/qcontainertools_impl.h @@ -147,6 +147,9 @@ using IfAssociativeIteratorHasFirstAndSecond = template using IfIsNotSame = typename std::enable_if::value, bool>::type; + +template +using IfIsNotConvertible = typename std::enable_if::value, bool>::type; } // namespace QtPrivate QT_END_NAMESPACE