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>bb10
parent
45271fb2ac
commit
61bd6afe39
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Reference in New Issue