diff options
| -rw-r--r-- | tests/auto/_Categories/QtGui.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qgroupbox/tst_qgroupbox.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qsplitter/qsplitter.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qsplitter/tst_qsplitter.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qstyle/qstyle.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt index dcb3be5..e07216f 100644 --- a/tests/auto/_Categories/QtGui.txt +++ b/tests/auto/_Categories/QtGui.txt @@ -87,7 +87,6 @@ qitemeditorfactory qitemmodel qitemselectionmodel qitemview -qkeyevent qkeysequence qlabel qlayout @@ -118,7 +117,6 @@ qpixmap qpixmapcache qpixmapfilter qplaintextedit -qpointarray #qprinter NO PRINTING SUPPORT ON SYMBIAN YET #qprinterinfo qprogressbar 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/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro index 8c3e40b..5ec2b9d 100644 --- a/tests/auto/qsplitter/qsplitter.pro +++ b/tests/auto/qsplitter/qsplitter.pro @@ -8,7 +8,7 @@ wince*|symbian*: { addFiles.sources = extradata.txt setSizes3.dat addFiles.path = . DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"./\\\" + !symbian:DEFINES += SRCDIR=\\\"./\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index a44e25d..d76bf78 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -57,6 +57,10 @@ #include <qdebug.h> // for file error messages #include "../../shared/util.h" +#if defined(Q_OS_SYMBIAN) +# define SRCDIR "" +#endif + //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro index 8163f26..1ffe369 100644 --- a/tests/auto/qstyle/qstyle.pro +++ b/tests/auto/qstyle/qstyle.pro @@ -3,7 +3,7 @@ TARGET.EPOCHEAPSIZE = 0x200000 0x800000 SOURCES += tst_qstyle.cpp wince*|symbian*: { - DEFINES += SRCDIR=\\\".\\\" + !symbian:DEFINES += SRCDIR=\\\".\\\" addPixmap.sources = task_25863.png addPixmap.path = . DEPLOYMENT += addPixmap 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; |