summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdialog
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-04 14:22:40 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-06 01:27:58 +0200
commit1fad83bac6d8606296588a688862f3883ea6f0d1 (patch)
tree6092b3929b312fb72db5fe408219900f11a688d5 /tests/auto/qdialog
parentaa52c26f094f2e109a96d32aad5d9e46f3fcfbd8 (diff)
Remove last remnants of symbian in autotests.
Change-Id: I91489614653cfe4bcf16b723976e33531402a464 Reviewed-on: http://codereview.qt-project.org/5948 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qdialog')
-rw-r--r--tests/auto/qdialog/tst_qdialog.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp
index 0f3f27446d..5672ce5e68 100644
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/qdialog/tst_qdialog.cpp
@@ -203,33 +203,14 @@ void tst_QDialog::showExtension()
QCOMPARE( testWidget->size(), dlgSize );
QPoint oldPosition = testWidget->pos();
-#ifdef Q_WS_S60
- const int htDiff = ext->size().height() - testWidget->size().height();
-#endif
// show
((DummyDialog*)testWidget)->showExtension( TRUE );
// while ( testWidget->size() == dlgSize )
// qApp->processEvents();
-#ifdef Q_WS_S60
- QPoint expectedPosition;
- if (!horizontal) {
- expectedPosition = QPoint(0, oldPosition.y() - extSize.height());
- } else {
- if (htDiff>0)
- expectedPosition = QPoint(0, oldPosition.y() - htDiff);
- else
- expectedPosition = oldPosition;
- }
-#endif
-
QTEST( testWidget->size(), "result" );
-#ifdef Q_WS_S60
- QCOMPARE(testWidget->pos(), expectedPosition);
-#else
QCOMPARE(testWidget->pos(), oldPosition);
-#endif
// hide extension. back to old size ?
((DummyDialog*)testWidget)->showExtension( FALSE );