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

Change-Id: I999ba23a27cd897017d15c6ffe41ea8cd008ffb9

2 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 3256130472..05b5579d64 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -253,6 +253,7 @@ private slots:
     void fillInt() const;
     void fillMovable() const;
     void fillCustom() const;
+    void fillDetaches() const;
     void first() const;
     void fromListInt() const;
     void fromListMovable() const;
@@ -1310,6 +1311,16 @@ void tst_QVector::fillCustom() const
     QCOMPARE(instancesCount, Custom::counter.loadAcquire());
 }
 
+void tst_QVector::fillDetaches() const
+{
+    QVector<int> test = { 1, 2, 3 };
+    QVector<int> copy = test;
+    copy.fill(42);
+
+    QCOMPARE(test, QVector<int>({1, 2, 3}));
+    QCOMPARE(copy, QVector<int>({42, 42, 42}));
+}
+
 void tst_QVector::first() const
 {
     QVector<int> myvec;
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index e24370fc87..95fee23fe3 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -71,6 +71,8 @@ class tst_Http2 : public QObject
 public:
     tst_Http2();
     ~tst_Http2();
+public slots:
+    void init();
 private slots:
     // Tests:
     void singleRequest_data();
@@ -174,6 +176,11 @@ tst_Http2::~tst_Http2()
     }
 }
 
+void tst_Http2::init()
+{
+    manager.clearConnectionCache();
+}
+
 void tst_Http2::singleRequest_data()
 {
     QTest::addColumn<QNetworkRequest::Attribute>("h2Attribute");