From 0122202baae21a19aab808eab39e15551953825c Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Mon, 21 Mar 2011 17:56:16 +0100 Subject: Bugfixing QLocale::weekdays and updating manual test Reviewed-by: Denis Dzyubenko --- tests/manual/qlocale/calendar.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/qlocale/calendar.cpp b/tests/manual/qlocale/calendar.cpp index 615e44ea06..bd4756e998 100644 --- a/tests/manual/qlocale/calendar.cpp +++ b/tests/manual/qlocale/calendar.cpp @@ -112,14 +112,8 @@ void CalendarWidget::maximumDateChanged(const QDate &date) } bool CalendarWidget::isWeekendDay(Qt::DayOfWeek day) { - Qt::DayOfWeek start = calendar->locale().weekendStart(); - Qt::DayOfWeek end = calendar->locale().weekendEnd(); - - if (start <= day && day <= end) - return true; - if (start > end && (day >= start || day <= end)) - return true; - return false; + QList week = calendar->locale().weekdays(); + return !week.contains(day); } void CalendarWidget::updateWeekendDays() { -- cgit v1.2.1