aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/calendar')
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-calendarmodel.pngbin5724 -> 4576 bytes
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow-layout.pngbin7455 -> 5816 bytes
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow.pngbin2017 -> 1996 bytes
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-monthgrid-layout.pngbin8876 -> 6648 bytes
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-monthgrid.pngbin3827 -> 2819 bytes
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn-layout.pngbin4986 -> 3860 bytes
-rw-r--r--src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn.pngbin1453 -> 1432 bytes
-rw-r--r--src/imports/calendar/doc/qtlabscalendar.qdocconf1
-rw-r--r--src/imports/calendar/doc/src/qtlabscalendar-index.qdoc2
-rw-r--r--src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc4
10 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-calendarmodel.png b/src/imports/calendar/doc/images/qtlabscalendar-calendarmodel.png
index 7a140d27..a0176823 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-calendarmodel.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-calendarmodel.png
Binary files differ
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow-layout.png b/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow-layout.png
index 130e3757..3a816e85 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow-layout.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow-layout.png
Binary files differ
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow.png b/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow.png
index 6c8424ab..7548e221 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-dayofweekrow.png
Binary files differ
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-monthgrid-layout.png b/src/imports/calendar/doc/images/qtlabscalendar-monthgrid-layout.png
index dd903650..f67501a7 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-monthgrid-layout.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-monthgrid-layout.png
Binary files differ
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-monthgrid.png b/src/imports/calendar/doc/images/qtlabscalendar-monthgrid.png
index 0c3b3c41..a2f9a47f 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-monthgrid.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-monthgrid.png
Binary files differ
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn-layout.png b/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
index b015a3e6..19fbeefd 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
Binary files differ
diff --git a/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn.png b/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn.png
index 65e25b29..a73cccd5 100644
--- a/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn.png
+++ b/src/imports/calendar/doc/images/qtlabscalendar-weeknumbercolumn.png
Binary files differ
diff --git a/src/imports/calendar/doc/qtlabscalendar.qdocconf b/src/imports/calendar/doc/qtlabscalendar.qdocconf
index 899dce21..9a88cb25 100644
--- a/src/imports/calendar/doc/qtlabscalendar.qdocconf
+++ b/src/imports/calendar/doc/qtlabscalendar.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
project = QtLabsCalendar
description = Qt Labs Calendar Reference Documentation
diff --git a/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc
index 517dbdb1..065379ec 100644
--- a/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc
+++ b/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc
@@ -46,6 +46,6 @@
\list
\li \l{Qt Quick}
\li \l{Qt Quick Layouts}
- \li \l{Qt Quick Controls 2}
+ \li \l{Qt Quick Controls}
\endlist
*/
diff --git a/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
index 29b1a2c0..81abf52a 100644
--- a/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
+++ b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
@@ -33,7 +33,7 @@
The \l{Qt Labs Calendar} module provides QML types for creating
calendars. These QML types work in conjunction with \l{Qt Quick} and
- \l{Qt Quick Controls 2}.
+ \l{Qt Quick Controls}.
The QML types can be imported into your application using the
following import statement in your .qml file:
@@ -51,7 +51,7 @@
\section1 Related Information
\list
- \li \l {Qt Quick Controls 2 QML Types}
+ \li \l {Qt Quick Controls QML Types}
\endlist
\noautolist