diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-04 14:22:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 01:27:58 +0200 |
| commit | 1fad83bac6d8606296588a688862f3883ea6f0d1 (patch) | |
| tree | 6092b3929b312fb72db5fe408219900f11a688d5 /tests/auto/qmessagebox/tst_qmessagebox.cpp | |
| parent | aa52c26f094f2e109a96d32aad5d9e46f3fcfbd8 (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/qmessagebox/tst_qmessagebox.cpp')
| -rw-r--r-- | tests/auto/qmessagebox/tst_qmessagebox.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index 463d4c4f82..ac33efc564 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -640,13 +640,7 @@ void tst_QMessageBox::incorrectDefaultButton() void tst_QMessageBox::updateSize() { QMessageBox box; -#ifdef Q_WS_S60 - // In S60 messagebox is always occupies maximum width, i.e. screen width - // so we need to have long enough text to split over several line - box.setText("This is awesome long text"); -#else box.setText("This is awesome"); -#endif box.show(); QSize oldSize = box.size(); QString longText; @@ -656,12 +650,9 @@ void tst_QMessageBox::updateSize() QVERIFY(box.size() != oldSize); // should have grown QVERIFY(box.width() > oldSize.width() || box.height() > oldSize.height()); oldSize = box.size(); -#ifndef Q_WS_S60 - // In S60 dialogs buttons are in softkey area -> message box size does not change box.setStandardButtons(QMessageBox::StandardButtons(0xFFFF)); QVERIFY(box.size() != oldSize); // should have grown QVERIFY(box.width() > oldSize.width() || box.height() > oldSize.height()); -#endif } void tst_QMessageBox::setInformativeText() |