diff options
4 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index 46e3457d6e..44a01d7b3c 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -5932,14 +5932,14 @@ void tst_QQuickGridView::cacheBuffer() QVERIFY(findItem<QQuickItem>(gridview, "wrapper", i) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(gridview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } @@ -5971,14 +5971,14 @@ void tst_QQuickGridView::cacheBuffer() QQuickItem *item = nullptr; while (!item) { qGuiApp->processEvents(); // allow refill to happen - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(gridview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } @@ -5999,7 +5999,7 @@ void tst_QQuickGridView::asynchronous() QQuickGridView *gridview = nullptr; while (!gridview) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); gridview = rootObject->findChild<QQuickGridView*>("view"); } @@ -6009,14 +6009,14 @@ void tst_QQuickGridView::asynchronous() QVERIFY(findItem<QQuickItem>(gridview, "wrapper", i) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(gridview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 229850f285..349d070a07 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -3204,14 +3204,14 @@ void tst_QQuickListView::cacheBuffer() QVERIFY(findItem<QQuickItem>(listview, "wrapper", i) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(listview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } @@ -3243,14 +3243,14 @@ void tst_QQuickListView::cacheBuffer() QQuickItem *item = nullptr; while (!item) { qGuiApp->processEvents(); // allow refill to happen - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(listview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } @@ -6194,7 +6194,7 @@ void tst_QQuickListView::asynchronous() QQuickListView *listview = nullptr; while (!listview) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); listview = rootObject->findChild<QQuickListView*>("view"); } @@ -6204,14 +6204,14 @@ void tst_QQuickListView::asynchronous() QVERIFY(findItem<QQuickItem>(listview, "wrapper", i) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(listview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index 8ba09fa509..efd533c017 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -1841,7 +1841,7 @@ void tst_QQuickPathView::asynchronous() QQuickPathView *pathview = nullptr; while (!pathview) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); pathview = rootObject->findChild<QQuickPathView*>("view"); } @@ -1851,14 +1851,14 @@ void tst_QQuickPathView::asynchronous() QVERIFY(findItem<QQuickItem>(pathview, "wrapper", i) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(pathview, "wrapper", i); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } @@ -2227,7 +2227,7 @@ void tst_QQuickPathView::cacheItemCount() QVERIFY(findItem<QQuickItem>(pathview, "wrapper", cached[i]) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(pathview, "wrapper", cached[i]); } @@ -2235,7 +2235,7 @@ void tst_QQuickPathView::cacheItemCount() } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } @@ -2255,13 +2255,13 @@ void tst_QQuickPathView::cacheItemCount() QVERIFY(findItem<QQuickItem>(pathview, "wrapper", 5) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(pathview, "wrapper", 5); } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } } diff --git a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp index 062cd9a5e7..a6b0ea7059 100644 --- a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp +++ b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp @@ -717,14 +717,14 @@ void tst_QQuickRepeater::asynchronous() QQuickItem *container = findItem<QQuickItem>(rootObject, "container"); QVERIFY(!container); while (!container) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); container = findItem<QQuickItem>(rootObject, "container"); } QQuickRepeater *repeater = nullptr; while (!repeater) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); repeater = findItem<QQuickRepeater>(rootObject, "repeater"); } @@ -737,14 +737,14 @@ void tst_QQuickRepeater::asynchronous() QVERIFY(findItem<QQuickItem>(container, name) == nullptr); QQuickItem *item = nullptr; while (!item) { - bool b = false; + std::atomic<bool> b = false; controller.incubateWhile(&b); item = findItem<QQuickItem>(container, name); } } { - bool b = true; + std::atomic<bool> b = true; controller.incubateWhile(&b); } |