4 files changed, 8 insertions, 9 deletions
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt
index 626155f8..3cef4d26 100644
--- a/src/imports/controls/CMakeLists.txt
+++ b/src/imports/controls/CMakeLists.txt
@@ -71,7 +71,7 @@ qt_add_resource(qtquickcontrols2plugin "qtquickcontrols2plugin"
 
 #### Keys ignored in scope 1:.:.:controls.pro:<TRUE>:
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir" "$$QML_FILES" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/calendar/*.qdoc" "$$PWD/src/templates/*.qdoc"
+# OTHER_FILES = "qmldir" "$$QML_FILES" "$$PWD/snippets/*.qml" "$$PWD/src/*.qdoc" "$$PWD/src/templates/*.qdoc"
 # TARGETPATH = "QtQuick/Controls.2"
 # _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
 
diff --git a/src/imports/controls/doc/doc.pri b/src/imports/controls/doc/doc.pri
index f1bf7e80..4bd8bd95 100644
--- a/src/imports/controls/doc/doc.pri
+++ b/src/imports/controls/doc/doc.pri
@@ -3,5 +3,4 @@ QMAKE_DOCS = $$PWD/qtquickcontrols.qdocconf
 OTHER_FILES += \
     $$files($$PWD/snippets/*.qml) \
     $$files($$PWD/src/*.qdoc) \
-    $$files($$PWD/src/calendar/*.qdoc) \
     $$files($$PWD/src/templates/*.qdoc)
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index bfb27dcb..7f8a066d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -224,12 +224,12 @@
     \row
         \li \l [QML QtQuickControls1] {Calendar}
         \li \mdash
-        \li \l [QML QtLabsCalendar] {MonthGrid},\br
-            \l [QML QtLabsCalendar] {DayOfWeekRow},\br
-            \l [QML QtLabsCalendar] {WeekNumberColumn} \br\sup {(Qt Labs Calendar)}
+        \li \l [QML QtQuickCalendar] {MonthGrid},\br
+            \l [QML QtQuickCalendar] {DayOfWeekRow},\br
+            \l [QML QtQuickCalendar] {WeekNumberColumn} \br\sup {(Qt Quick Calendar)}
         \li \list
-                \li \b {Qt Labs Calendar}: \c MonthGrid, \c DayOfWeek, and \c WeekNumberColumn
-                    are \e experimental unstyled building blocks for calendar views.
+                \li \b {Qt Quick Calendar}: \c MonthGrid, \c DayOfWeek, and \c WeekNumberColumn
+                    are \e unstyled building blocks for calendar views.
             \endlist
     \row
         \li \l [QML QtQuickControls1] {CheckBox}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index ac306aaa..fee009e6 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -90,7 +90,7 @@
             \l {Material Style}{\c QtQuick.Controls.Material},\br
             \l {Universal Style}{\c QtQuick.Controls.Universal},\br
             \l {Qt Quick Templates 2 QML Types}{\c QtQuick.Templates}
-        \li \l {Qt Labs Calendar QML Types}{\c Qt.labs.calendar},\br
+        \li \l {Qt Quick Calendar QML Types}{\c QtQuick.Calendar},\br
             \l {Qt Labs Platform QML Types}{\c Qt.labs.platform}
       \row
         \li 5.7
@@ -182,7 +182,7 @@
       \li \l{Qt Quick}
       \li \l{Qt Quick Layouts}
       \li \l{Qt Quick Templates 2}
-      \li \l{Qt Labs Calendar}
+      \li \l{Qt Quick Calendar}
       \li \l{Qt Labs Platform}
     \endlist
 */