Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  qSwap: use std::swap as implementation, and specialize std::swap for our container

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp
index 690bbbd..17e6c04 100644
--- a/tests/auto/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp
@@ -81,6 +81,7 @@ private slots:
     void test_qBinaryFind();
     void qBinaryFindOneEntry();
     void swap();
+    void swap2();
     void sortEmptyList();
     void sortedList();
     void sortAPItest();
@@ -521,6 +522,28 @@ void tst_QAlgorithms::swap()
     }
 }
 
+namespace SwapTest {
+    struct ST { int i; int j; };
+    void swap(ST &a, ST &b) {
+        a.i = b.j;
+        b.i = a.j;
+    }
+}
+
+void tst_QAlgorithms::swap2()
+{
+    {
+#ifndef QT_NO_SQL
+        //check the namespace lookup works correctly
+        SwapTest::ST a = { 45, 65 };
+        SwapTest::ST b = { 48, 68 };
+        qSwap(a, b);
+        QCOMPARE(a.i, 68);
+        QCOMPARE(b.i, 65);
+#endif
+    }
+}
+
 void tst_QAlgorithms::sortEmptyList()
 {
     // Only test if it crashes