diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:02:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:03:53 +0100 |
| commit | 5ada1525e03116326a480fb05611904d3484c296 (patch) | |
| tree | f23822e6b0482012065b9586d95cb8ab5d70c4bf /src/imports/calendar | |
| parent | f4f5e857447d42738b1b60b5c4184f39df2f1593 (diff) | |
| parent | 4f1fb09ed70c69e73f2e19f28f4299f4cfbc90dc (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitignore
src/templates/qquickcombobox_p.h
src/templates/qquickmenu_p.h
src/templates/qquickmenu_p_p.h
src/templates/qquickoverlay_p.h
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p.h
src/templates/qquickstackview_p.cpp
Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/qquickcalendarmodel.cpp | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickdayofweekrow.cpp | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickmonthgrid.cpp | 4 | ||||
| -rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn.cpp | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/imports/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp index 832513d7..6b59d45a 100644 --- a/src/imports/calendar/qquickcalendarmodel.cpp +++ b/src/imports/calendar/qquickcalendarmodel.cpp @@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE \row \li \b model.year : int \li The number of the year \endtable + \labs + \sa MonthGrid */ diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index e87c3d45..1f5e4387 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -64,6 +64,8 @@ QT_BEGIN_NAMESPACE The visual appearance of DayOfWeekRow can be changed by implementing a \l {delegate}{custom delegate}. + \labs + \sa MonthGrid, WeekNumberColumn */ diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index 07e3448a..8fe9ad63 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \inherits Control \instantiates QQuickMonthGrid \inqmlmodule Qt.labs.calendar - \brief A calendar view. + \brief A grid of days for a calendar month. MonthGrid presents a calendar month in a grid. The contents are calculated for a given \l month and \l year, using the specified @@ -68,6 +68,8 @@ QT_BEGIN_NAMESPACE The visual appearance of MonthGrid can be changed by implementing a \l {delegate}{custom delegate}. + \labs + \sa DayOfWeekRow, WeekNumberColumn, CalendarModel */ diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index 1a796ce0..031b0555 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -66,6 +66,8 @@ QT_BEGIN_NAMESPACE The visual appearance of WeekNumberColumn can be changed by implementing a \l {delegate}{custom delegate}. + \labs + \sa MonthGrid, DayOfWeekRow */ |