From e4961b35deb202525d4711dbb14f8c2bb0bf5c26 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 2 Sep 2020 12:15:07 +0200 Subject: Revert "Revert "QVector: add a construction from QArrayDataPointerRef"" Removing the constructor caused a binary compatibility break. The symbol is being used even though it might be considered private API. This reverts commit bf8268956b866e022825f81aa46833749a1ece28. Fixes: QTBUG-86392 Pick-to: 5.15 Change-Id: I04fc3058e68a6a0cf293bcc8a5a83031dc1e96fb Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen --- src/corelib/tools/qvector.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/tools/qvector.h') diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 083f12beb2..288c082c44 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -80,6 +80,7 @@ public: QVector &operator=(std::initializer_list args); template = true> inline QVector(InputIterator first, InputIterator last); + explicit QVector(QArrayDataPointerRef ref) noexcept : d(ref.ptr) {} bool operator==(const QVector &v) const; inline bool operator!=(const QVector &v) const { return !(*this == v); } -- cgit v1.2.3