1 files changed, 31 insertions, 12 deletions
diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index 06db0e8546..18432e51a6 100644
--- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -48,6 +48,11 @@ class tst_QAlgorithms : public QObject
 {
     Q_OBJECT
 private slots:
+    void swap();
+    void swap2();
+    void convenienceAPI();
+
+#if QT_DEPRECATED_SINCE(5, 2)
     void test_qLowerBound_data();
     void test_qLowerBound();
     void test_qUpperBound_data();
@@ -55,19 +60,23 @@ private slots:
     void test_qBinaryFind_data();
     void test_qBinaryFind();
     void qBinaryFindOneEntry();
-    void swap();
-    void swap2();
     void sortEmptyList();
     void sortedList();
     void sortAPItest();
     void stableSortTest();
     void stableSortCorrectnessTest_data();
     void stableSortCorrectnessTest();
-    void convenienceAPI();
+    void convenienceAPI_deprecated();
     void qCountIterators() const;
     void qCountContainer() const;
     void binaryFindOnLargeContainer() const;
 
+#if Q_TEST_PERFORMANCE
+    void performance();
+#endif
+
+#endif // QT_DEPRECATED_SINCE(5, 2)
+
     void popCount08_data() { popCount_data_impl(sizeof(quint8 )); }
     void popCount16_data() { popCount_data_impl(sizeof(quint16)); }
     void popCount32_data() { popCount_data_impl(sizeof(quint32)); }
@@ -96,9 +105,6 @@ private slots:
     void countLeading64()      { countLeading_impl<quint64>(); }
 
 private:
-#if Q_TEST_PERFORMANCE
-    void performance();
-#endif
     void popCount_data_impl(size_t sizeof_T_Int);
     template <typename T_Int>
     void popCount_impl();
@@ -112,6 +118,8 @@ private:
     void countLeading_impl();
 };
 
+#if QT_DEPRECATED_SINCE(5, 2)
+
 class TestInt
 {
 public:
@@ -172,7 +180,7 @@ ResultSet testRun(ContainerType &container, Algorithm &algorithm, int millisecs)
 {
     TestInt::lessThanRefCount = 0;
     int count = 0;
-    QTime t;
+    QElapsedTimer t;
     t.start();
     while(t.elapsed() < millisecs) {
         ++count;
@@ -257,6 +265,8 @@ void testAlgorithm(Algorithm algorithm, QStringList &dataSetTypes)
 }
 #endif
 
+#endif // QT_DEPRECATED_SINCE(5, 2)
+
 void tst_QAlgorithms::swap()
 {
     {
@@ -391,6 +401,17 @@ void tst_QAlgorithms::swap2()
     }
 }
 
+void tst_QAlgorithms::convenienceAPI()
+{
+    // Compile-test for QAlgorithm convenience functions.
+
+    QList<int *> pointerList;
+    qDeleteAll(pointerList);
+    qDeleteAll(pointerList.begin(), pointerList.end());
+}
+
+#if QT_DEPRECATED_SINCE(5, 2)
+
 void tst_QAlgorithms::sortEmptyList()
 {
     // Only test if it crashes
@@ -676,7 +697,7 @@ void tst_QAlgorithms::stableSortCorrectnessTest()
     QVERIFY(isSorted(sorted));
 }
 
-void tst_QAlgorithms::convenienceAPI()
+void tst_QAlgorithms::convenienceAPI_deprecated()
 {
     // Compile-test for QAlgorithm convenience functions.
     QList<int> list, list2;
@@ -716,10 +737,6 @@ void tst_QAlgorithms::convenienceAPI()
     qBinaryFind(list, 1);
     qBinaryFind(list.begin(), list.end(),  1);
     qBinaryFind(list.begin(), list.end(), 1, qLess<int>());
-
-    QList<int *> pointerList;
-    qDeleteAll(pointerList);
-    qDeleteAll(pointerList.begin(), pointerList.end());
 }
 
 template <typename DataType>
@@ -1041,6 +1058,8 @@ void tst_QAlgorithms::binaryFindOnLargeContainer() const
   QCOMPARE(foundIt.pos(), 1073987655);
 }
 
+#endif // QT_DEPRECATED_SINCE(5, 2)
+
 // alternative implementation of qPopulationCount for comparison:
 static Q_DECL_CONSTEXPR const uint bitsSetInNibble[] = {
     0, 1, 1, 2, 1, 2, 2, 3,