1 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 0dd1161dcf..835aeaa4df 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -4274,7 +4274,7 @@ void tst_QGraphicsItem::cursor()
 void tst_QGraphicsItem::textControlGetterSetter()
 {
     QGraphicsTextItem *item = new QGraphicsTextItem;
-    QVERIFY(item->textControl()->parent() == item);
+    QCOMPARE(item->textControl()->parent(), item);
     QPointer<QWidgetTextControl> control = item->textControl();
     delete item;
     QVERIFY(!control);
@@ -4285,7 +4285,7 @@ void tst_QGraphicsItem::textControlGetterSetter()
     control = new QWidgetTextControl;
 
     item->setTextControl(control);
-    QVERIFY(item->textControl() == control);
+    QCOMPARE(item->textControl(), control);
     QVERIFY(!control->parent());
     QVERIFY(!oldControl);
 
@@ -5141,19 +5141,19 @@ void tst_QGraphicsItem::paint()
     //nominal case, update call paint
     tester2.update();
     qApp->processEvents();
-    QTRY_VERIFY(tester2.painted == 2);
+    QTRY_COMPARE(tester2.painted, 2);
 
     //we remove the item from the scene, number of updates is still the same
     tester2.update();
     scene2.removeItem(&tester2);
     qApp->processEvents();
-    QTRY_VERIFY(tester2.painted == 2);
+    QTRY_COMPARE(tester2.painted, 2);
 
     //We re-add the item, the number of paint should increase
     scene2.addItem(&tester2);
     tester2.update();
     qApp->processEvents();
-    QTRY_VERIFY(tester2.painted == 3);
+    QTRY_COMPARE(tester2.painted, 3);
 }
 
 class HarakiriItem : public QGraphicsRectItem
@@ -5878,7 +5878,7 @@ void tst_QGraphicsItem::itemContainsChildrenInShape()
     scene.setItemIndexMethod(QGraphicsScene::NoIndex);
     scene.addItem(parent);
 
-    QVERIFY(parent->boundingRectCalls == childOutsideShape->boundingRectCalls);
+    QCOMPARE(parent->boundingRectCalls, childOutsideShape->boundingRectCalls);
 
     int oldParentBoundingRectCalls = parent->boundingRectCalls;
     int oldChildBoundingRectCalls = childOutsideShape->boundingRectCalls;
@@ -5886,10 +5886,10 @@ void tst_QGraphicsItem::itemContainsChildrenInShape()
     // First test that both items are searched if no optimization flags are set
     QGraphicsItem* item = scene.itemAt(25,5);
 
-    QVERIFY(item == childOutsideShape);
+    QCOMPARE(item, childOutsideShape);
     QVERIFY(parent->boundingRectCalls > oldParentBoundingRectCalls);
     QVERIFY(childOutsideShape->boundingRectCalls > oldChildBoundingRectCalls);
-    QVERIFY(parent->boundingRectCalls == childOutsideShape->boundingRectCalls);
+    QCOMPARE(parent->boundingRectCalls, childOutsideShape->boundingRectCalls);
 
     oldParentBoundingRectCalls = parent->boundingRectCalls;
     oldChildBoundingRectCalls = childOutsideShape->boundingRectCalls;
@@ -5897,10 +5897,10 @@ void tst_QGraphicsItem::itemContainsChildrenInShape()
     // Repeat the test to make sure that no caching/indexing is in effect
     item = scene.itemAt(25,5);
 
-    QVERIFY(item == childOutsideShape);
+    QCOMPARE(item, childOutsideShape);
     QVERIFY(parent->boundingRectCalls > oldParentBoundingRectCalls);
     QVERIFY(childOutsideShape->boundingRectCalls > oldChildBoundingRectCalls);
-    QVERIFY(parent->boundingRectCalls == childOutsideShape->boundingRectCalls);
+    QCOMPARE(parent->boundingRectCalls, childOutsideShape->boundingRectCalls);
 
     oldParentBoundingRectCalls = parent->boundingRectCalls;
     oldChildBoundingRectCalls = childOutsideShape->boundingRectCalls;
@@ -5912,7 +5912,7 @@ void tst_QGraphicsItem::itemContainsChildrenInShape()
 
     QVERIFY(!(item));
     QVERIFY(parent->boundingRectCalls > oldParentBoundingRectCalls);
-    QVERIFY(childOutsideShape->boundingRectCalls == oldChildBoundingRectCalls);
+    QCOMPARE(childOutsideShape->boundingRectCalls, oldChildBoundingRectCalls);
     QVERIFY(parent->boundingRectCalls > childOutsideShape->boundingRectCalls);
 }
 
@@ -11205,21 +11205,21 @@ void tst_QGraphicsItem::QTBUG_6738_missingUpdateWithSetParent()
     child2->setVisible(false);
     child2->setParentItem(child);
 
-    QTRY_VERIFY(view.repaints == 1);
+    QTRY_COMPARE(view.repaints, 1);
 
     // test case #2
     view.reset();
     child3->setOpacity(0.0);
     child3->setParentItem(child);
 
-    QTRY_VERIFY(view.repaints == 1);
+    QTRY_COMPARE(view.repaints, 1);
 
     // test case #3
     view.reset();
     child4->setParentItem(child);
     child4->setVisible(false);
 
-    QTRY_VERIFY(view.repaints == 1);
+    QTRY_COMPARE(view.repaints, 1);
 }
 
 void tst_QGraphicsItem::QT_2653_fullUpdateDiscardingOpacityUpdate()
@@ -11469,9 +11469,9 @@ void tst_QGraphicsItem::itemDiesDuringDraggingOperation()
     QGraphicsSceneDragDropEvent event(QEvent::GraphicsSceneDragMove);
     event.setScenePos(item->boundingRect().center());
     QApplication::sendEvent(&scene, &event);
-    QVERIFY(QGraphicsScenePrivate::get(&scene)->dragDropItem == item);
+    QCOMPARE(QGraphicsScenePrivate::get(&scene)->dragDropItem, item);
     delete item;
-    QVERIFY(QGraphicsScenePrivate::get(&scene)->dragDropItem == 0);
+    QVERIFY(!QGraphicsScenePrivate::get(&scene)->dragDropItem);
 }
 
 void tst_QGraphicsItem::QTBUG_12112_focusItem()