← Back to branch summary

~timo-jyrinki/ubuntu-calendar-app/use_pickerpanelworkaround_lp1351024

« back to all changes in this revision

Viewing changes to TimeLineBaseComponent.qml

  • Committer: Jason
  • Date: 2014-07-29 21:18:36 UTC
  • mfrom: (370 ubuntu-calendar-app)
  • mto: This revision was merged to the branch mainline in revision 373.
  • Revision ID: gerlowskija@gmail.com-20140729211836-3a0np2sfnk1q3jr8
Merge trunk branch back into this bug-fix branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
TimeLineBaseComponent.qml
60
60
        id: mainModel
61
61
        startPeriod: startDay.midnight();
62
62
        endPeriod: type == ViewType.ViewTypeWeek ? startPeriod.addDays(7).endOfDay(): startPeriod.endOfDay()
 
63
        filter: eventModel.filter
63
64
    }
64
65
 
65
66
    ActivityIndicator {