summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-10-05 07:53:57 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-10-05 07:57:39 (GMT)
commit7655e27047790d89f9af0132946ad5db5138e7bf (patch)
tree52a4b6162f3cdf01f57454a4221736d59b396d03 /tests
parent1aaa11708eb0f8281e6de2c4ea6f04e5d38813e0 (diff)
downloadQt-7655e27047790d89f9af0132946ad5db5138e7bf.zip
Qt-7655e27047790d89f9af0132946ad5db5138e7bf.tar.gz
Qt-7655e27047790d89f9af0132946ad5db5138e7bf.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
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();