diff options
59 files changed, 119 insertions, 116 deletions
@@ -5,7 +5,7 @@ /lib /mkspecs -/examples/quick/calendar/calendar +/examples/labs/calendar/calendar /examples/quick/controls/mirroring/mirroring /examples/quick/controls/theme/theme /examples/quick/controls/tabs/tabs diff --git a/examples/examples.pro b/examples/examples.pro index 9d95812f..e0f52889 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ + labs \ quick diff --git a/examples/quick/calendar/DateTimePicker.qml b/examples/labs/calendar/DateTimePicker.qml index 21519856..96da4175 100644 --- a/examples/quick/calendar/DateTimePicker.qml +++ b/examples/labs/calendar/DateTimePicker.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T diff --git a/examples/quick/calendar/EventView.qml b/examples/labs/calendar/EventView.qml index 3991e5eb..3991e5eb 100644 --- a/examples/quick/calendar/EventView.qml +++ b/examples/labs/calendar/EventView.qml diff --git a/examples/quick/calendar/TumblerDelegate.qml b/examples/labs/calendar/TumblerDelegate.qml index e9c7a143..e9c7a143 100644 --- a/examples/quick/calendar/TumblerDelegate.qml +++ b/examples/labs/calendar/TumblerDelegate.qml diff --git a/examples/quick/calendar/calendar.pro b/examples/labs/calendar/calendar.pro index 105e7fc9..105e7fc9 100644 --- a/examples/quick/calendar/calendar.pro +++ b/examples/labs/calendar/calendar.pro diff --git a/examples/quick/calendar/calendar.qrc b/examples/labs/calendar/calendar.qrc index d0f67b26..d0f67b26 100644 --- a/examples/quick/calendar/calendar.qrc +++ b/examples/labs/calendar/calendar.qrc diff --git a/examples/quick/calendar/main.cpp b/examples/labs/calendar/main.cpp index 651a51ec..651a51ec 100644 --- a/examples/quick/calendar/main.cpp +++ b/examples/labs/calendar/main.cpp diff --git a/examples/quick/calendar/main.qml b/examples/labs/calendar/main.qml index 4bddf2a4..ca23b166 100644 --- a/examples/quick/calendar/main.qml +++ b/examples/labs/calendar/main.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 import QtQuick.Templates 2.0 as T import QtQuick.Layouts 1.0 import io.qt.examples.calendar 1.0 @@ -53,7 +53,7 @@ ApplicationWindow { minimumHeight: 300 color: "#f4f4f4" visible: true - title: "Qt Quick Controls - Calendar Example" + title: "Qt Labs Calendar - Example" SqlEventModel { id: eventModel diff --git a/examples/labs/labs.pro b/examples/labs/labs.pro new file mode 100644 index 00000000..88683726 --- /dev/null +++ b/examples/labs/labs.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS += \ + calendar diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 80f94e86..ab3cd2b2 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS += \ - calendar \ controls diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index 4b61d363..425f4588 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 AbstractCalendarView { id: control diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 1e870b13..7f8763d0 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 AbstractDayOfWeekRow { id: control diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 93407172..27d70636 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 AbstractWeekNumberColumn { id: control diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro index e8e29b8f..1498c081 100644 --- a/src/imports/calendar/calendar.pro +++ b/src/imports/calendar/calendar.pro @@ -1,6 +1,6 @@ -TARGET = qtquickcalendar2plugin -TARGETPATH = QtQuick/Calendar.2 -IMPORT_VERSION = 2.0 +TARGET = qtlabscalendarplugin +TARGETPATH = Qt/labs/calendar +IMPORT_VERSION = 1.0 QT += qml quick QT += core-private gui-private qml-private quick-private quicktemplates-private @@ -13,7 +13,7 @@ OTHER_FILES += \ qmldir SOURCES += \ - $$PWD/qtquickcalendar2plugin.cpp + $$PWD/qtlabscalendarplugin.cpp include(calendar.pri) diff --git a/src/imports/calendar/qmldir b/src/imports/calendar/qmldir index 7a72edee..1b85db6f 100644 --- a/src/imports/calendar/qmldir +++ b/src/imports/calendar/qmldir @@ -1,6 +1,6 @@ -module QtQuick.Calendar -plugin qtquickcalendar2plugin -classname QtQuickCalendar2Plugin -CalendarView 2.0 CalendarView.qml -DayOfWeekRow 2.0 DayOfWeekRow.qml -WeekNumberColumn 2.0 WeekNumberColumn.qml +module Qt.labs.calendar +plugin qtlabscalendarplugin +classname QtLabsCalendarPlugin +CalendarView 1.0 CalendarView.qml +DayOfWeekRow 1.0 DayOfWeekRow.qml +WeekNumberColumn 1.0 WeekNumberColumn.qml diff --git a/src/imports/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp index 39e0c118..cfbfd25c 100644 --- a/src/imports/calendar/qquickcalendarmodel.cpp +++ b/src/imports/calendar/qquickcalendarmodel.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -44,14 +44,14 @@ QT_BEGIN_NAMESPACE \qmltype CalendarModel \inherits QAbstractListModel \instantiates QQuickCalendarModel - \inqmlmodule QtQuick.Calendar + \inqmlmodule Qt.labs.calendar \brief A calendar model. CalendarModel provides a way of creating a range of CalendarView instances. It is typically used as a model for a ListView that uses CalendarView as a delegate. - \snippet calendarmodel/qtquickcalendar2-calendarmodel.qml 1 + \snippet calendarmodel/qtlabscalendar-calendarmodel.qml 1 In addition to the \c index property, a list of model data roles are available in the context of each delegate: @@ -116,7 +116,7 @@ QQuickCalendarModel::QQuickCalendarModel(QObject *parent) : } /*! - \qmlproperty date QtQuick.Calendar::CalendarModel::from + \qmlproperty date Qt.labs.calendar::CalendarModel::from This property holds the start date. */ @@ -138,7 +138,7 @@ void QQuickCalendarModel::setFrom(const QDate &from) } /*! - \qmlproperty date QtQuick.Calendar::CalendarModel::to + \qmlproperty date Qt.labs.calendar::CalendarModel::to This property holds the end date. */ @@ -160,7 +160,7 @@ void QQuickCalendarModel::setTo(const QDate &to) } /*! - \qmlmethod int QtQuick.Calendar::CalendarModel::monthAt(int index) + \qmlmethod int Qt.labs.calendar::CalendarModel::monthAt(int index) Returns the month number at the specified model \a index. */ @@ -171,7 +171,7 @@ int QQuickCalendarModel::monthAt(int index) const } /*! - \qmlmethod int QtQuick.Calendar::CalendarModel::yearAt(int index) + \qmlmethod int Qt.labs.calendar::CalendarModel::yearAt(int index) Returns the year number at the specified model \a index. */ @@ -182,7 +182,7 @@ int QQuickCalendarModel::yearAt(int index) const } /*! - \qmlmethod int QtQuick.Calendar::CalendarModel::indexOf(Date date) + \qmlmethod int Qt.labs.calendar::CalendarModel::indexOf(Date date) Returns the model index of the specified \a date. */ @@ -192,7 +192,7 @@ int QQuickCalendarModel::indexOf(const QDate &date) const } /*! - \qmlmethod int QtQuick.Calendar::CalendarModel::indexOf(int year, int month) + \qmlmethod int Qt.labs.calendar::CalendarModel::indexOf(int year, int month) Returns the model index of the specified \a year and \a month. */ diff --git a/src/imports/calendar/qquickcalendarmodel_p.h b/src/imports/calendar/qquickcalendarmodel_p.h index 2501acfb..f46dcc4c 100644 --- a/src/imports/calendar/qquickcalendarmodel_p.h +++ b/src/imports/calendar/qquickcalendarmodel_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickcalendarview.cpp b/src/imports/calendar/qquickcalendarview.cpp index 9b90c89f..2b470e70 100644 --- a/src/imports/calendar/qquickcalendarview.cpp +++ b/src/imports/calendar/qquickcalendarview.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -47,22 +47,22 @@ QT_BEGIN_NAMESPACE \qmltype CalendarView \inherits Control \instantiates QQuickCalendarView - \inqmlmodule QtQuick.Calendar + \inqmlmodule Qt.labs.calendar \brief A calendar view. CalendarView presents a calendar month in a grid. The contents are calculated for a given \l month and \l year, using the specified \l locale. - \image qtquickcalendar2-calendarview.png - \snippet calendarview/qtquickcalendar2-calendarview.qml 1 + \image qtlabscalendar-calendarview.png + \snippet calendarview/qtlabscalendar-calendarview.qml 1 CalendarView can be used as a standalone control, but it is most often used in conjunction with DayOfWeekRow and WeekNumberColumn. Regardless of the use case, positioning of the grid is left to the user. - \image qtquickcalendar2-calendarview-layout.png - \snippet calendarview/qtquickcalendar2-calendarview-layout.qml 1 + \image qtlabscalendar-calendarview-layout.png + \snippet calendarview/qtlabscalendar-calendarview-layout.qml 1 The visual appearance of CalendarView can be changed by implementing a \l {delegate}{custom delegate}. @@ -177,7 +177,7 @@ QQuickCalendarView::QQuickCalendarView(QQuickItem *parent) : } /*! - \qmlproperty int QtQuick.Calendar::CalendarView::month + \qmlproperty int Qt.labs.calendar::CalendarView::month This property holds the number of the month. */ @@ -194,7 +194,7 @@ void QQuickCalendarView::setMonth(int month) } /*! - \qmlproperty int QtQuick.Calendar::CalendarView::year + \qmlproperty int Qt.labs.calendar::CalendarView::year This property holds the number of the year. */ @@ -211,7 +211,7 @@ void QQuickCalendarView::setYear(int year) } /*! - \qmlproperty Locale QtQuick.Calendar::CalendarView::locale + \qmlproperty Locale Qt.labs.calendar::CalendarView::locale This property holds the locale that is used to calculate the contents. */ @@ -229,7 +229,7 @@ void QQuickCalendarView::setLocale(const QLocale &locale) /*! \internal - \qmlproperty model QtQuick.Calendar::CalendarView::source + \qmlproperty model Qt.labs.calendar::CalendarView::source This property holds the source model that is used as a data model for the internal content column. @@ -250,7 +250,7 @@ void QQuickCalendarView::setSource(const QVariant &source) } /*! - \qmlproperty string QtQuick.Calendar::CalendarView::title + \qmlproperty string Qt.labs.calendar::CalendarView::title This property holds a title for the calendar. @@ -276,7 +276,7 @@ void QQuickCalendarView::setTitle(const QString &title) } /*! - \qmlproperty Component QtQuick.Calendar::CalendarView::delegate + \qmlproperty Component Qt.labs.calendar::CalendarView::delegate This property holds the item delegate that visualizes each day. diff --git a/src/imports/calendar/qquickcalendarview_p.h b/src/imports/calendar/qquickcalendarview_p.h index e69b5ddf..27b5c988 100644 --- a/src/imports/calendar/qquickcalendarview_p.h +++ b/src/imports/calendar/qquickcalendarview_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickdayofweekmodel.cpp b/src/imports/calendar/qquickdayofweekmodel.cpp index 11a9bc3e..bee78bd8 100644 --- a/src/imports/calendar/qquickdayofweekmodel.cpp +++ b/src/imports/calendar/qquickdayofweekmodel.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickdayofweekmodel_p.h b/src/imports/calendar/qquickdayofweekmodel_p.h index 4e827ad9..87e04695 100644 --- a/src/imports/calendar/qquickdayofweekmodel_p.h +++ b/src/imports/calendar/qquickdayofweekmodel_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 1fceee35..ba9e27e5 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -45,21 +45,21 @@ QT_BEGIN_NAMESPACE \qmltype DayOfWeekRow \inherits Control \instantiates QQuickDayOfWeekRow - \inqmlmodule QtQuick.Calendar + \inqmlmodule Qt.labs.calendar \brief A row of names for the days in a week. DayOfWeekRow presents day of week names in a row. The names of the days are ordered and formatted using the specified \l locale. - \image qtquickcalendar2-dayofweekrow.png - \snippet dayofweekrow/qtquickcalendar2-dayofweekrow.qml 1 + \image qtlabscalendar-dayofweekrow.png + \snippet dayofweekrow/qtlabscalendar-dayofweekrow.qml 1 DayOfWeekRow can be used as a standalone control, but it is most often used in conjunction with CalendarView. Regardless of the use case, positioning of the row is left to the user. - \image qtquickcalendar2-dayofweekrow-layout.png - \snippet dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml 1 + \image qtlabscalendar-dayofweekrow-layout.png + \snippet dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml 1 The visual appearance of DayOfWeekRow can be changed by implementing a \l {delegate}{custom delegate}. @@ -102,7 +102,7 @@ QQuickDayOfWeekRow::QQuickDayOfWeekRow(QQuickItem *parent) : } /*! - \qmlproperty Locale QtQuick.Calendar::DayOfWeekRow::locale + \qmlproperty Locale Qt.labs.calendar::DayOfWeekRow::locale This property holds the locale that is used to format names of the days in a week. */ @@ -120,7 +120,7 @@ void QQuickDayOfWeekRow::setLocale(const QLocale &locale) /*! \internal - \qmlproperty model QtQuick.Calendar::DayOfWeekRow::source + \qmlproperty model Qt.labs.calendar::DayOfWeekRow::source This property holds the source model that is used as a data model for the internal content row. @@ -141,7 +141,7 @@ void QQuickDayOfWeekRow::setSource(const QVariant &source) } /*! - \qmlproperty Component QtQuick.Calendar::DayOfWeekRow::delegate + \qmlproperty Component Qt.labs.calendar::DayOfWeekRow::delegate This property holds the item delegate that visualizes each day of the week. diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index e0ea0939..4a89c262 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickmonthmodel.cpp b/src/imports/calendar/qquickmonthmodel.cpp index 064712ca..7188bc00 100644 --- a/src/imports/calendar/qquickmonthmodel.cpp +++ b/src/imports/calendar/qquickmonthmodel.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickmonthmodel_p.h b/src/imports/calendar/qquickmonthmodel_p.h index da4afcb4..6d79de9a 100644 --- a/src/imports/calendar/qquickmonthmodel_p.h +++ b/src/imports/calendar/qquickmonthmodel_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index e898acac..5a884eb6 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -45,22 +45,22 @@ QT_BEGIN_NAMESPACE \qmltype WeekNumberColumn \inherits Control \instantiates QQuickWeekNumberColumn - \inqmlmodule QtQuick.Calendar + \inqmlmodule Qt.labs.calendar \brief A column of week numbers. WeekNumberColumn presents week numbers in a column. The week numbers are calculated for a given \l month and \l year, using the specified \l locale. - \image qtquickcalendar2-weeknumbercolumn.png - \snippet weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml 1 + \image qtlabscalendar-weeknumbercolumn.png + \snippet weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml 1 WeekNumberColumn can be used as a standalone control, but it is most often used in conjunction with CalendarView. Regardless of the use case, positioning of the column is left to the user. - \image qtquickcalendar2-weeknumbercolumn-layout.png - \snippet weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml 1 + \image qtlabscalendar-weeknumbercolumn-layout.png + \snippet weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml 1 The visual appearance of WeekNumberColumn can be changed by implementing a \l {delegate}{custom delegate}. @@ -105,7 +105,7 @@ QQuickWeekNumberColumn::QQuickWeekNumberColumn(QQuickItem *parent) : } /*! - \qmlproperty int QtQuick.Calendar::WeekNumberColumn::month + \qmlproperty int Qt.labs.calendar::WeekNumberColumn::month This property holds the number of the month that the week numbers are calculated for. */ @@ -122,7 +122,7 @@ void QQuickWeekNumberColumn::setMonth(int month) } /*! - \qmlproperty int QtQuick.Calendar::WeekNumberColumn::year + \qmlproperty int Qt.labs.calendar::WeekNumberColumn::year This property holds the number of the year that the week numbers are calculated for. */ @@ -139,7 +139,7 @@ void QQuickWeekNumberColumn::setYear(int year) } /*! - \qmlproperty Locale QtQuick.Calendar::WeekNumberColumn::locale + \qmlproperty Locale Qt.labs.calendar::WeekNumberColumn::locale This property holds the locale that is used to calculate the week numbers. */ @@ -157,7 +157,7 @@ void QQuickWeekNumberColumn::setLocale(const QLocale &locale) /*! \internal - \qmlproperty model QtQuick.Calendar::WeekNumberColumn::source + \qmlproperty model Qt.labs.calendar::WeekNumberColumn::source This property holds the source model that is used as a data model for the internal content column. @@ -178,7 +178,7 @@ void QQuickWeekNumberColumn::setSource(const QVariant &source) } /*! - \qmlproperty Component QtQuick.Calendar::WeekNumberColumn::delegate + \qmlproperty Component Qt.labs.calendar::WeekNumberColumn::delegate This property holds the item delegate that visualizes each week number. diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index efc2c172..743f6e33 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickweeknumbermodel.cpp b/src/imports/calendar/qquickweeknumbermodel.cpp index 34d66202..f6a0b014 100644 --- a/src/imports/calendar/qquickweeknumbermodel.cpp +++ b/src/imports/calendar/qquickweeknumbermodel.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qquickweeknumbermodel_p.h b/src/imports/calendar/qquickweeknumbermodel_p.h index 2ca706c4..6b73bb36 100644 --- a/src/imports/calendar/qquickweeknumbermodel_p.h +++ b/src/imports/calendar/qquickweeknumbermodel_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/calendar/qtquickcalendar2plugin.cpp b/src/imports/calendar/qtlabscalendarplugin.cpp index 5d4f0419..b3c7cc9d 100644 --- a/src/imports/calendar/qtquickcalendar2plugin.cpp +++ b/src/imports/calendar/qtlabscalendarplugin.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Calendar module of the Qt Toolkit. +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -class QtQuickCalendar2Plugin: public QQmlExtensionPlugin +class QtLabsCalendarPlugin: public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") @@ -52,14 +52,14 @@ public: void registerTypes(const char *uri); }; -void QtQuickCalendar2Plugin::registerTypes(const char *uri) +void QtLabsCalendarPlugin::registerTypes(const char *uri) { - qmlRegisterType<QQuickCalendarView>(uri, 2, 0, "AbstractCalendarView"); - qmlRegisterType<QQuickDayOfWeekRow>(uri, 2, 0, "AbstractDayOfWeekRow"); - qmlRegisterType<QQuickWeekNumberColumn>(uri, 2, 0, "AbstractWeekNumberColumn"); - qmlRegisterType<QQuickCalendarModel>(uri, 2, 0, "CalendarModel"); + qmlRegisterType<QQuickCalendarView>(uri, 1, 0, "AbstractCalendarView"); + qmlRegisterType<QQuickDayOfWeekRow>(uri, 1, 0, "AbstractDayOfWeekRow"); + qmlRegisterType<QQuickWeekNumberColumn>(uri, 1, 0, "AbstractWeekNumberColumn"); + qmlRegisterType<QQuickCalendarModel>(uri, 1, 0, "CalendarModel"); } QT_END_NAMESPACE -#include "qtquickcalendar2plugin.moc" +#include "qtlabscalendarplugin.moc" diff --git a/src/imports/controls/doc/images/qtquickcalendar2-calendarview-layout.png b/src/imports/controls/doc/images/qtlabscalendar-calendarview-layout.png Binary files differindex c5182644..c5182644 100644 --- a/src/imports/controls/doc/images/qtquickcalendar2-calendarview-layout.png +++ b/src/imports/controls/doc/images/qtlabscalendar-calendarview-layout.png diff --git a/src/imports/controls/doc/images/qtquickcalendar2-calendarview.png b/src/imports/controls/doc/images/qtlabscalendar-calendarview.png Binary files differindex 79d0ebc0..79d0ebc0 100644 --- a/src/imports/controls/doc/images/qtquickcalendar2-calendarview.png +++ b/src/imports/controls/doc/images/qtlabscalendar-calendarview.png diff --git a/src/imports/controls/doc/images/qtquickcalendar2-dayofweekrow-layout.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png Binary files differindex fd4dc065..fd4dc065 100644 --- a/src/imports/controls/doc/images/qtquickcalendar2-dayofweekrow-layout.png +++ b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png diff --git a/src/imports/controls/doc/images/qtquickcalendar2-dayofweekrow.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png Binary files differindex 2d650a88..2d650a88 100644 --- a/src/imports/controls/doc/images/qtquickcalendar2-dayofweekrow.png +++ b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png diff --git a/src/imports/controls/doc/images/qtquickcalendar2-weeknumbercolumn-layout.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png Binary files differindex f11be89d..f11be89d 100644 --- a/src/imports/controls/doc/images/qtquickcalendar2-weeknumbercolumn-layout.png +++ b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png diff --git a/src/imports/controls/doc/images/qtquickcalendar2-weeknumbercolumn.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png Binary files differindex 07ecc9f4..07ecc9f4 100644 --- a/src/imports/controls/doc/images/qtquickcalendar2-weeknumbercolumn.png +++ b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png diff --git a/src/imports/controls/doc/src/calendar/qtquickcalendar2-index.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc index 47f5e6ad..dedfad4c 100644 --- a/src/imports/controls/doc/src/calendar/qtquickcalendar2-index.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc @@ -26,18 +26,18 @@ ****************************************************************************/ /*! - \page qtquickcalendar2-index.html - \title Qt Quick Calendar 2 + \page qtlabscalendar-index.html + \title Qt Labs Calendar - \brief The Qt Quick Calendar 2 module provides a set of UI controls for Qt + \brief The Qt Labs Calendar module provides a set of UI controls for Qt Quick. - The Qt Quick Calendar 2 module provides a set of types that can be used + The Qt Labs Calendar module provides a set of types that can be used to build calendars in Qt Quick. \section1 QML Types - \generatelist {qmltypesbymodule QtQuick.Calendar} + \generatelist {qmltypesbymodule Qt.labs.calendar} \section1 Related Information diff --git a/src/imports/controls/doc/src/calendar/qtquickcalendar2.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc index 7dcb5f1e..b363195a 100644 --- a/src/imports/controls/doc/src/calendar/qtquickcalendar2.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc @@ -26,12 +26,12 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Calendar 2.0 - \title Qt Quick Calendar 2 QML Types + \qmlmodule Qt.labs.calendar 1.0 + \title Qt Labs Calendar QML Types \ingroup qmlmodules - \brief Provides QML types for calendars (Qt Quick Calendar 2). + \brief Provides QML types for calendars (Qt Labs Calendar). - The \l{Qt Quick Calendar 2} module provides QML types for creating + 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}. @@ -39,12 +39,12 @@ following import statement in your .qml file: \badcode - import QtQuick.Calendar 2.0 + import Qt.labs.calendar 1.0 \endcode \section1 QML Types - \generatelist {qmltypesbymodule QtQuick.Calendar} + \generatelist {qmltypesbymodule Qt.labs.calendar} \section1 Related Information diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 8e526926..ab8b9aaa 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -39,8 +39,8 @@ \section2 QtQuick.Controls Module \generatelist {qmltypesbymodule QtQuick.Controls} - \section2 QtQuick.Calendar Module - \generatelist {qmltypesbymodule QtQuick.Calendar} + \section2 Qt.labs.calendar Module + \generatelist {qmltypesbymodule Qt.labs.calendar} \section1 Differences between Qt Quick Controls @@ -336,7 +336,7 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Layouts} - \li \l{Qt Quick Calendar 2} + \li \l{Qt Labs Calendar} \li \l{Qt Quick Controls 2 QML Types}{Qt Quick Controls 2 QML Types} \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2.qdoc b/src/imports/controls/doc/src/qtquickcontrols2.qdoc index 9157db0f..a02ab439 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2.qdoc @@ -46,7 +46,7 @@ following statement: \badcode - import QtQuick.Calendar 2.0 + import Qt.labs.calendar 1.0 \endcode \section1 QML Types @@ -54,7 +54,7 @@ \section2 QtQuick.Controls Module \generatelist {qmltypesbymodule QtQuick.Controls} - \section2 QtQuick.Calendar Module - \generatelist {qmltypesbymodule QtQuick.Calendar} + \section2 Qt.labs.calendar Module + \generatelist {qmltypesbymodule Qt.labs.calendar} \noautolist */ diff --git a/tests/auto/accessibility/data/calendarview-2.qml b/tests/auto/accessibility/data/calendarview-2.qml index ab4a2177..526662b7 100644 --- a/tests/auto/accessibility/data/calendarview-2.qml +++ b/tests/auto/accessibility/data/calendarview-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/calendarview.qml b/tests/auto/accessibility/data/calendarview.qml index 3b377ef6..f2452901 100644 --- a/tests/auto/accessibility/data/calendarview.qml +++ b/tests/auto/accessibility/data/calendarview.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/dayofweekrow-2.qml b/tests/auto/accessibility/data/dayofweekrow-2.qml index a562916a..26569836 100644 --- a/tests/auto/accessibility/data/dayofweekrow-2.qml +++ b/tests/auto/accessibility/data/dayofweekrow-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/dayofweekrow.qml b/tests/auto/accessibility/data/dayofweekrow.qml index dc6243ea..c799aba1 100644 --- a/tests/auto/accessibility/data/dayofweekrow.qml +++ b/tests/auto/accessibility/data/dayofweekrow.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/weeknumbercolumn-2.qml index c6af782d..bc3b1739 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn-2.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/weeknumbercolumn.qml b/tests/auto/accessibility/data/weeknumbercolumn.qml index 8728d6ea..7fadb5da 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/calendar/data/tst_calendarview.qml b/tests/auto/calendar/data/tst_calendarview.qml index b605d664..ef1e4380 100644 --- a/tests/auto/calendar/data/tst_calendarview.qml +++ b/tests/auto/calendar/data/tst_calendarview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 TestCase { id: testCase diff --git a/tests/auto/calendar/data/tst_dayofweekrow.qml b/tests/auto/calendar/data/tst_dayofweekrow.qml index 04c6ef9e..4d332110 100644 --- a/tests/auto/calendar/data/tst_dayofweekrow.qml +++ b/tests/auto/calendar/data/tst_dayofweekrow.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 TestCase { id: testCase diff --git a/tests/auto/calendar/data/tst_weeknumbercolumn.qml b/tests/auto/calendar/data/tst_weeknumbercolumn.qml index 98465bf3..f0c84bc0 100644 --- a/tests/auto/calendar/data/tst_weeknumbercolumn.qml +++ b/tests/auto/calendar/data/tst_weeknumbercolumn.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 TestCase { id: testCase diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index 1b9eebdd..6568f0dc 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -147,7 +147,7 @@ void tst_Sanity::initTestCase() { QQmlEngine engine; foreach (const QString &path, engine.importPathList()) { - files.unite(listQmlFiles(QDir(path + "/QtQuick/Calendar.2"))); + files.unite(listQmlFiles(QDir(path + "/Qt/labs/calendar"))); files.unite(listQmlFiles(QDir(path + "/QtQuick/Controls.2"))); } } diff --git a/tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml index 357e5ced..3874ea44 100644 --- a/tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T diff --git a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml index 8aba4e02..8aaddba6 100644 --- a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml +++ b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] GridLayout { diff --git a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml index 1795668f..b853d635 100644 --- a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml +++ b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] CalendarView { diff --git a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml index cb4fa2f3..d013b167 100644 --- a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] ColumnLayout { diff --git a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml index e600e9c3..7d6f159f 100644 --- a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] DayOfWeekRow { diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml index f954c2af..479b069c 100644 --- a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] RowLayout { diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml index a36fe2a2..eaa50bff 100644 --- a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] WeekNumberColumn { diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 9185d5b5..5d8d9b1c 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -115,14 +115,14 @@ void tst_CreationTime::calendar() { QFETCH(QByteArray, control); QQmlComponent component(&engine); - component.setData("import QtQuick.Calendar 2.0;" + control + "{}", QUrl()); + component.setData("import Qt.labs.calendar 1.0;" + control + "{}", QUrl()); doBenchmark(&component); } void tst_CreationTime::calendar_data() { QTest::addColumn<QByteArray>("control"); - addTestRows(engine.importPathList(), "QtQuick/Calendar.2"); + addTestRows(engine.importPathList(), "Qt/labs/calendar"); } QTEST_MAIN(tst_CreationTime) |
