summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-10-05 07:53:57 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-05 09:50:24 (GMT)
commita4245ded41a1710d1f6b140fde66af0b5121250d (patch)
tree52a4b6162f3cdf01f57454a4221736d59b396d03 /tests
parent5850ba16e9905677af58461bb5efc7fcb43a976a (diff)
downloadQt-a4245ded41a1710d1f6b140fde66af0b5121250d.zip
Qt-a4245ded41a1710d1f6b140fde66af0b5121250d.tar.gz
Qt-a4245ded41a1710d1f6b140fde66af0b5121250d.tar.bz2
Fixed tst_qgraphicsitem.cpp compilation for Nokia X86 compiler.
Nokia X86 compiler is not able to resolve correct templated qCompare functionfor derived types. So implicit casting does nto work corectly. I have tried to add template specilations for qCompare also, but then compiler complainf about unambiguous functions. The promlem for now is fixed by adding explicit cast to same type against which the comparuion is done. Reviewed-by: TrustMe (cherry picked from commit 7655e27047790d89f9af0132946ad5db5138e7bf)
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 9545198..e2e8c5f 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -7631,7 +7631,7 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
QVERIFY(items.isEmpty());
items = scene.items(QPointF(80, 80));
QCOMPARE(items.size(), 1);
- QCOMPARE(items.at(0), static_cast<EventTester *>(item3));
+ QCOMPARE(items.at(0), static_cast<QGraphicsItem *>(item3));
item1->repaints = 0;
item2->repaints = 0;
@@ -7654,7 +7654,7 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
QVERIFY(items.isEmpty());
items = scene.items(QPointF(80, 80));
QCOMPARE(items.size(), 1);
- QCOMPARE(items.at(0), static_cast<EventTester *>(item3));
+ QCOMPARE(items.at(0), static_cast<QGraphicsItem *>(item3));
}
void tst_QGraphicsItem::focusProxy()
@@ -8384,7 +8384,7 @@ void tst_QGraphicsItem::ensureDirtySceneTransform()
QGraphicsView view(&scene);
view.show();
QTest::qWaitForWindowShown(&view);
- QTRY_COMPARE(QApplication::activeWindow(), &view);
+ QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
//We move the parent
parent->move();