Revert "QAtomic: remove the copy ctor and assignment operator"

This reverts commit 6a93ec2435b8a453d43956fef6afa5f091d70ffc.

Reason for revert: Breaks qtdeclarative build, submodules need
to be clean before we deprecate or remove APIs.

Change-Id: Id0726b9bfad6072065b380b44b6ff6dffda79e45
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index 315256e471..e8606b2568 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -21,6 +21,8 @@ private slots:
     // QAtomicInt members
     void constructor_data();
     void constructor();
+    void copy_constructor_data();
+    void copy_constructor();
     void assignment_operator_data();
     void assignment_operator();
 
@@ -234,6 +236,25 @@ void tst_QAtomicInt::constructor()
     QCOMPARE(atomic2.loadRelaxed(), value);
 }
 
+void tst_QAtomicInt::copy_constructor_data()
+{ constructor_data(); }
+
+void tst_QAtomicInt::copy_constructor()
+{
+    QFETCH(int, value);
+    QAtomicInt atomic1(value);
+    QCOMPARE(atomic1.loadRelaxed(), value);
+
+    QAtomicInt atomic2(atomic1);
+    QCOMPARE(atomic2.loadRelaxed(), value);
+    QAtomicInt atomic3 = atomic1;
+    QCOMPARE(atomic3.loadRelaxed(), value);
+    QAtomicInt atomic4(atomic2);
+    QCOMPARE(atomic4.loadRelaxed(), value);
+    QAtomicInt atomic5 = atomic2;
+    QCOMPARE(atomic5.loadRelaxed(), value);
+}
+
 void tst_QAtomicInt::assignment_operator_data()
 {
     QTest::addColumn<int>("value");
@@ -258,6 +279,10 @@ void tst_QAtomicInt::assignment_operator()
         QCOMPARE(atomic1.loadRelaxed(), newval);
         atomic1 = value;
         QCOMPARE(atomic1.loadRelaxed(), value);
+
+        QAtomicInt atomic2 = newval;
+        atomic1 = atomic2;
+        QCOMPARE(atomic1.loadRelaxed(), atomic2.loadRelaxed());
     }
 }