diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-22 14:40:38 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-30 16:40:43 +0200 |
commit | 61bd6afe39e20e1fa2ddfebce4ca43d5a54df664 (patch) | |
tree | 0f4d55556d9ff382f561f6d0430658baca12ffc5 /tests/auto/widgets | |
parent | 45271fb2acf8bea21a5c820b52757302969c0816 (diff) |
Re-enable a QDateTimeEdit right-to-left test of its sectionText()
Use a QScopeGuard to fix its restoration of left-to-right mode after completion.
Change-Id: I5ac1e44629e72d993f2d5ba6586b86508d57cdaf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r-- | tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index a1dd1197a3..7bc188cf19 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -2407,13 +2407,16 @@ void tst_QDateTimeEdit::sectionText() testWidget->setDisplayFormat(format); testWidget->setDateTime(dateTime); - QCOMPARE(testWidget->sectionText((QDateTimeEdit::Section)section), sectionText); -// QApplication::setLayoutDirection(Qt::RightToLeft); -// testWidget->setDisplayFormat(format); -// QCOMPARE(format, testWidget->displayFormat()); -// testWidget->setDateTime(dateTime); -// QCOMPARE(testWidget->sectionText((QDateTimeEdit::Section)section), sectionText); -// QApplication::setLayoutDirection(Qt::LeftToRight); + QCOMPARE(testWidget->sectionText(QDateTimeEdit::Section(section)), sectionText); + + QApplication::setLayoutDirection(Qt::RightToLeft); + const QScopeGuard resetLayoutDirection([]() { + QApplication::setLayoutDirection(Qt::LeftToRight); + }); + testWidget->setDisplayFormat(format); + QCOMPARE(format, testWidget->displayFormat()); + testWidget->setDateTime(dateTime); + QCOMPARE(testWidget->sectionText(QDateTimeEdit::Section(section)), sectionText); } void tst_QDateTimeEdit::mousePress() |