Restructure the docs to separate the experimental labs QML types

Including the experimental Qt Labs Calendar docs to qqc2.qdocconf leads
to Qt Creator's help contents being mixed with QML types from both
modules. Move the Qt Labs Calendar to its own .qdocconf the same way
it's done for Qt Labs Platform, and just link to both from the index
page. This also ensures that the index-search offers "Calendar" from
"Qt Quick Controls (1)" and "Qt Labs Calendar" instead of "Qt Quick
Controls 2".

Change-Id: Iaf5e7df6d3013657c774d65bf76fb7bc2f80aa71
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

16 files changed, 3 insertions, 330 deletions

diff --git a/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png b/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
deleted file mode 100644
index 7a140d27..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
deleted file mode 100644
index 130e3757..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
deleted file mode 100644
index 6c8424ab..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
deleted file mode 100644
index dd903650..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
deleted file mode 100644
index 0c3b3c41..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
deleted file mode 100644
index b015a3e6..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
deleted file mode 100644
index 65e25b29..00000000
--- a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
+++ /dev/null
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 73f9bdfc..a01b48e5 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -29,7 +29,7 @@ qhp.QtQuickControls2.subprojects.examples.title = Examples
 qhp.QtQuickControls2.subprojects.examples.indexTitle = Qt Quick Controls 2 Examples
 qhp.QtQuickControls2.subprojects.examples.selectors = fake:example
 
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform
 
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
@@ -37,20 +37,16 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquic
 exampledirs += ../../../../examples/quickcontrols2 \
                ../ \
                ../../../quicktemplates2 \
-               ../../calendar \
                snippets
 
 examplesinstallpath = quickcontrols2
 
 headerdirs += ../../../quicktemplates2 \
-              ../../../quickcontrols2 \
-              ../../calendar
+              ../../../quickcontrols2
 
 sourcedirs += ../../../quicktemplates2 \
               ../../../quickcontrols2 \
               ../../templates/doc/src \
-              ../../calendar/doc/src \
-              ../../calendar \
               src
 
 imagedirs += images
@@ -84,7 +80,6 @@ macro.endstylemethod = "\\br"
 macro.stylecolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\">\1 \2</div>"
 
 macro.nbsp.HTML = "&nbsp;"
-macro.labs = "\\note \\e{Types in Qt.labs modules are not guaranteed to remain compatible in future versions.}"
 
 #Add output suffix to the html filenames
 outputsuffixes = QML
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml b/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
deleted file mode 100644
index 37a6ced7..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import Qt.labs.calendar 1.0
-import QtQuick.Controls 2.1
-
-//! [1]
-ListView {
-    id: listview
-
-    width: 200; height: 200
-    snapMode: ListView.SnapOneItem
-    orientation: ListView.Horizontal
-    highlightRangeMode: ListView.StrictlyEnforceRange
-
-    model: CalendarModel {
-        from: new Date(2015, 0, 1)
-        to: new Date(2015, 11, 31)
-    }
-
-    delegate: MonthGrid {
-        width: listview.width
-        height: listview.height
-
-        month: model.month
-        year: model.year
-        locale: Qt.locale("en_US")
-    }
-
-    ScrollIndicator.horizontal: ScrollIndicator { }
-}
-//! [1]
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml b/src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
deleted file mode 100644
index ce41d224..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import Qt.labs.calendar 1.0
-
-//! [1]
-ColumnLayout {
-    DayOfWeekRow {
-        locale: grid.locale
-        Layout.fillWidth: true
-    }
-
-    MonthGrid {
-        id: grid
-        month: Calendar.December
-        year: 2015
-        locale: Qt.locale("en_US")
-        Layout.fillWidth: true
-    }
-}
-//! [1]
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml b/src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml
deleted file mode 100644
index 5ea3714c..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import Qt.labs.calendar 1.0
-
-//! [1]
-DayOfWeekRow {
-    locale: Qt.locale("en_US")
-}
-//! [1]
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml b/src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml
deleted file mode 100644
index 346e6099..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import Qt.labs.calendar 1.0
-
-//! [1]
-GridLayout {
-    columns: 2
-
-    DayOfWeekRow {
-        locale: grid.locale
-
-        Layout.column: 1
-        Layout.fillWidth: true
-    }
-
-    WeekNumberColumn {
-        month: grid.month
-        year: grid.year
-        locale: grid.locale
-
-        Layout.fillHeight: true
-    }
-
-    MonthGrid {
-        id: grid
-        month: Calendar.December
-        year: 2015
-        locale: Qt.locale("en_US")
-
-        Layout.fillWidth: true
-        Layout.fillHeight: true
-    }
-}
-//! [1]
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml b/src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml
deleted file mode 100644
index 16f872b8..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import Qt.labs.calendar 1.0
-
-//! [1]
-MonthGrid {
-    month: Calendar.December
-    year: 2015
-    locale: Qt.locale("en_US")
-}
-//! [1]
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml b/src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
deleted file mode 100644
index d105553f..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
-import Qt.labs.calendar 1.0
-
-//! [1]
-RowLayout {
-    WeekNumberColumn {
-        month: grid.month
-        year: grid.year
-        locale: grid.locale
-        Layout.fillHeight: true
-    }
-
-    MonthGrid {
-        id: grid
-        month: Calendar.December
-        year: 2015
-        locale: Qt.locale("en_US")
-        Layout.fillHeight: true
-    }
-}
-//! [1]
diff --git a/src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml b/src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
deleted file mode 100644
index e58e5c7b..00000000
--- a/src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import Qt.labs.calendar 1.0
-
-//! [1]
-WeekNumberColumn {
-    month: Calendar.December
-    year: 2015
-    locale: Qt.locale("en_US")
-}
-//! [1]
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index a021805a..1155032b 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -92,5 +92,6 @@
       \li \l{Qt Quick Layouts}
       \li \l{Qt Quick Templates 2}
       \li \l{Qt Labs Calendar}
+      \li \l{Qt Labs Platform}
     \endlist
 */