From 61bd6afe39e20e1fa2ddfebce4ca43d5a54df664 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 22 Sep 2020 14:40:38 +0200 Subject: 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 Reviewed-by: Andreas Buhr Reviewed-by: Andrei Golubev --- .../widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'tests/auto/widgets') 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() -- cgit v1.2.3