summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-12 10:26:43 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-12 10:26:43 (GMT)
commitb64f4af233f0672c40e44358f0efa80ebfaa7620 (patch)
tree893bd6e48bbc0766ea28bc696217731b1c65fb8f
parent6383349c11fdff670a0244edb16fd7b7750a4e62 (diff)
downloadQt-b64f4af233f0672c40e44358f0efa80ebfaa7620.zip
Qt-b64f4af233f0672c40e44358f0efa80ebfaa7620.tar.gz
Qt-b64f4af233f0672c40e44358f0efa80ebfaa7620.tar.bz2
Workaround for Nokia X86 compiler, to compile get more GUI test compile.
Apparently Nokia X86 compiler is not able to use templated qCompare when given arguments have different different type but same base class. This error should be isolated and reported to Nokia X86 team. See task: 259508
-rw-r--r--tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp2
-rw-r--r--tests/auto/qgroupbox/tst_qgroupbox.cpp2
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 892e182..0b15928 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -597,7 +597,7 @@ void tst_QGraphicsItem::destruction()
child->setParentItem(parent);
parent->setVisible(false);
scene->addItem(parent);
- QCOMPARE(child->parentItem(), parent);
+ QCOMPARE(child->parentItem(), static_cast<QGraphicsItem*>(parent));
delete scene;
QCOMPARE(itemDeleted, 110);
}
diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/qgroupbox/tst_qgroupbox.cpp
index 4933deb..383326d 100644
--- a/tests/auto/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/qgroupbox/tst_qgroupbox.cpp
@@ -467,7 +467,7 @@ void tst_QGroupBox::propagateFocus()
box.show();
box.setFocus();
QTest::qWait(250);
- QCOMPARE(qApp->focusWidget(), &lineEdit);
+ QCOMPARE(qApp->focusWidget(), static_cast<QWidget*>(&lineEdit));
}
QTEST_MAIN(tst_QGroupBox)
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 98a5e73..0014e12 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9272,7 +9272,7 @@ void tst_QWidget::inputFocus_task257832()
QSKIP("No input context", SkipSingle);
widget->setFocus();
context->setFocusWidget(widget);
- QCOMPARE(context->focusWidget(), widget);
+ QCOMPARE(context->focusWidget(), static_cast<QWidget*>(widget));
widget->setReadOnly(true);
QVERIFY(!context->focusWidget());
delete widget;