summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2011-03-21 17:56:16 +0100
committerZeno Albisser <zeno.albisser@nokia.com>2011-03-22 11:02:49 +0100
commit0122202baae21a19aab808eab39e15551953825c (patch)
tree0d354080448176cd14aa5fe5a871e63da74b1685 /tests/manual
parent209201b7047c605405a83e9c104f8c81f9195feb (diff)
Bugfixing QLocale::weekdays and updating manual test
Reviewed-by: Denis Dzyubenko
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/qlocale/calendar.cpp10
1 files changed, 2 insertions, 8 deletions
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<Qt::DayOfWeek> week = calendar->locale().weekdays();
+ return !week.contains(day);
}
void CalendarWidget::updateWeekendDays() {