summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2012-04-17 22:07:49 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2012-04-17 22:07:49 +1000
commit30e45c584cffe914b0e2e26521c783d15c6177e0 (patch)
tree26cbb1290bd3b77c12e70ddf7872921ecc7bf131
parent66364f400dddae6bb90af3f9a3e8ed970a6516a7 (diff)
parent016f3cf74a60de3aa6e9f0af5ba6058869c8d94a (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo: Fix event reminder editing in calendardemo
-rw-r--r--examples/calendardemo/src/eventeditpage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/calendardemo/src/eventeditpage.cpp b/examples/calendardemo/src/eventeditpage.cpp
index 130ecbaac8..7144e6517a 100644
--- a/examples/calendardemo/src/eventeditpage.cpp
+++ b/examples/calendardemo/src/eventeditpage.cpp
@@ -224,11 +224,11 @@ void EventEditPage::eventChanged(QOrganizerManager *manager, const QOrganizerEve
// limit 3 minutes is rounded up to 5 minutes
if (reminder.secondsBeforeStart() == 0)
m_alarmComboBox->setCurrentIndex(1);
- else if (reminder.secondsBeforeStart() < 300)
+ else if (reminder.secondsBeforeStart() <= 300)
m_alarmComboBox->setCurrentIndex(2);
- else if (reminder.secondsBeforeStart() < 900)
+ else if (reminder.secondsBeforeStart() <= 900)
m_alarmComboBox->setCurrentIndex(3);
- else if (reminder.secondsBeforeStart() < 1800)
+ else if (reminder.secondsBeforeStart() <= 1800)
m_alarmComboBox->setCurrentIndex(4);
else
m_alarmComboBox->setCurrentIndex(5);