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

Change-Id: I469b0501cc65fc5ce4d797a69ae89405cc69c7f8

1 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index dae274a8b6..5b7ded0ecb 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -586,7 +586,7 @@ void tst_QWizard::addPage()
 #define CHECK_VISITED(wizard, list) \
     do { \
         QList<int> myList = list; \
-        QCOMPARE((wizard).visitedPages(), myList); \
+        QCOMPARE((wizard).visitedIds(), myList); \
         Q_FOREACH(int id, myList) \
             QVERIFY((wizard).hasVisitedPage(id)); \
     } while (0)
@@ -2293,7 +2293,7 @@ void tst_QWizard::removePage()
 
     wizard.restart();
     QCOMPARE(wizard.pageIds().size(), 4);
-    QCOMPARE(wizard.visitedPages().size(), 1);
+    QCOMPARE(wizard.visitedIds().size(), 1);
     QCOMPARE(spy.count(), 0);
 
     // Removing a non-existent page
@@ -2331,14 +2331,14 @@ void tst_QWizard::removePage()
     wizard.setPage(2, page2); // restore
     wizard.restart();
     wizard.next();
-    QCOMPARE(wizard.visitedPages().size(), 2);
+    QCOMPARE(wizard.visitedIds().size(), 2);
     QCOMPARE(wizard.currentPage(), page1);
     QCOMPARE(spy.count(), 0);
     wizard.removePage(2);
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), 2);
-    QCOMPARE(wizard.visitedPages().size(), 2);
+    QCOMPARE(wizard.visitedIds().size(), 2);
     QVERIFY(!wizard.pageIds().contains(2));
     QCOMPARE(wizard.currentPage(), page1);
 
@@ -2347,14 +2347,14 @@ void tst_QWizard::removePage()
     wizard.restart();
     wizard.next();
     QCOMPARE(spy.count(), 0);
-    QCOMPARE(wizard.visitedPages().size(), 2);
+    QCOMPARE(wizard.visitedIds().size(), 2);
     QCOMPARE(wizard.currentPage(), page1);
     wizard.removePage(0);
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), 0);
-    QCOMPARE(wizard.visitedPages().size(), 1);
-    QVERIFY(!wizard.visitedPages().contains(0));
+    QCOMPARE(wizard.visitedIds().size(), 1);
+    QVERIFY(!wizard.visitedIds().contains(0));
     QVERIFY(!wizard.pageIds().contains(0));
     QCOMPARE(wizard.currentPage(), page1);
 
@@ -2363,14 +2363,14 @@ void tst_QWizard::removePage()
     wizard.restart();
     wizard.next();
     QCOMPARE(spy.count(), 0);
-    QCOMPARE(wizard.visitedPages().size(), 2);
+    QCOMPARE(wizard.visitedIds().size(), 2);
     QCOMPARE(wizard.currentPage(), page1);
     wizard.removePage(1);
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), 1);
-    QCOMPARE(wizard.visitedPages().size(), 1);
-    QVERIFY(!wizard.visitedPages().contains(1));
+    QCOMPARE(wizard.visitedIds().size(), 1);
+    QVERIFY(!wizard.visitedIds().contains(1));
     QVERIFY(!wizard.pageIds().contains(1));
     QCOMPARE(wizard.currentPage(), page0);
 
@@ -2379,8 +2379,8 @@ void tst_QWizard::removePage()
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), 0);
-    QCOMPARE(wizard.visitedPages().size(), 1);
-    QVERIFY(!wizard.visitedPages().contains(0));
+    QCOMPARE(wizard.visitedIds().size(), 1);
+    QVERIFY(!wizard.visitedIds().contains(0));
     QCOMPARE(wizard.pageIds().size(), 2);
     QVERIFY(!wizard.pageIds().contains(0));
     QCOMPARE(wizard.currentPage(), page2);
@@ -2389,8 +2389,8 @@ void tst_QWizard::removePage()
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), 2);
-    QCOMPARE(wizard.visitedPages().size(), 1);
-    QVERIFY(!wizard.visitedPages().contains(2));
+    QCOMPARE(wizard.visitedIds().size(), 1);
+    QVERIFY(!wizard.visitedIds().contains(2));
     QCOMPARE(wizard.pageIds().size(), 1);
     QVERIFY(!wizard.pageIds().contains(2));
     QCOMPARE(wizard.currentPage(), page3);
@@ -2399,7 +2399,7 @@ void tst_QWizard::removePage()
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), 3);
-    QVERIFY(wizard.visitedPages().empty());
+    QVERIFY(wizard.visitedIds().empty());
     QVERIFY(wizard.pageIds().empty());
     QCOMPARE(wizard.currentPage(), nullptr);
 }