Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 91733bea90..b8baa1cde1 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -276,6 +276,8 @@ private slots:
     void shouldDeleteVariantDataWorksForAssociative();
     void fromStdVariant();
     void qt4UuidDataStream();
+    void sequentialIterableEndianessSanityCheck();
+    void sequentialIterableAppend();
 
     void preferDirectConversionOverInterfaces();
 
@@ -4698,6 +4700,28 @@ void tst_QVariant::qt4UuidDataStream()
     QCOMPARE(result.value<QUuid>(), source);
 }
 
+void tst_QVariant::sequentialIterableEndianessSanityCheck()
+{
+    namespace QMTP = QtMetaTypePrivate;
+    uint oldIteratorCaps = QMTP::ForwardCapability | QMTP::BiDirectionalCapability | QMTP::RandomAccessCapability;
+    QMTP::QSequentialIterableImpl seqImpl {};
+    QCOMPARE(seqImpl.revision(), 1u);
+    memcpy(&seqImpl._iteratorCapabilities, &oldIteratorCaps, sizeof(oldIteratorCaps));
+    QCOMPARE(seqImpl.revision(), 0u);
+}
+
+void tst_QVariant::sequentialIterableAppend()
+{
+    QVector<int> container {1, 2};
+    auto variant = QVariant::fromValue(container);
+    QVERIFY(variant.canConvert<QtMetaTypePrivate::QSequentialIterableImpl>());
+    auto asIterable = variant.value<QtMetaTypePrivate::QSequentialIterableImpl>();
+    const int i = 3, j = 4;
+    asIterable.append(&i);
+    asIterable.append(&j);
+    QCOMPARE(variant.value<QVector<int>>(), QVector<int> ({1, 2, 3, 4}));
+}
+
 void tst_QVariant::preferDirectConversionOverInterfaces()
 {
     using namespace QtMetaTypePrivate;