diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-07-15 22:57:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 13:13:53 +0100 |
| commit | e023dd212c81a2ad4ba4b4db22df9cde65a502e8 (patch) | |
| tree | 2c3521e8a4154d65a55fc3032254b58b181d957e /src/controls/plugin.cpp | |
| parent | e88bdffe644e53912dfbce95117555cb6a87bfd2 (diff) | |
Add Calendar to Qt Quick Controls.
Task-number: QTBUG-29948
[ChangeLog][QtQuickControls] Calendar was added. Calendar allows
selection of dates from a grid of days, similar to
QCalendarWidget.
Change-Id: I279130e704bc0dfd8dfe114ec9b6b49e111faf96
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/plugin.cpp')
| -rw-r--r-- | src/controls/plugin.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index aba186590..40cc38e33 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -49,6 +49,9 @@ #include "qquickstack_p.h" #include "qquickdesktopiconprovider_p.h" #include "qquickselectionmode_p.h" + +#include "Private/qquickcalendarmodel_p.h" +#include "Private/qquickrangeddate_p.h" #include "Private/qquickrangemodel_p.h" #include "Private/qquickwheelarea_p.h" #include "Private/qquicktooltip_p.h" @@ -75,6 +78,7 @@ static const struct { } qmldir [] = { { "ApplicationWindow", 1, 0 }, { "Button", 1, 0 }, + { "Calendar", 1, 2 }, { "CheckBox", 1, 0 }, { "ComboBox", 1, 0 }, { "GroupBox", 1, 0 }, @@ -131,7 +135,9 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri // Register private API const char *private_uri = "QtQuick.Controls.Private"; qmlRegisterType<QQuickAbstractStyle>(private_uri, 1, 0, "AbstractStyle"); + qmlRegisterType<QQuickCalendarModel>(private_uri, 1, 0, "CalendarModel"); qmlRegisterType<QQuickPadding>(); + qmlRegisterType<QQuickRangedDate>(private_uri, 1, 0, "RangedDate"); qmlRegisterType<QQuickRangeModel>(private_uri, 1, 0, "RangeModel"); qmlRegisterType<QQuickWheelArea>(private_uri, 1, 0, "WheelArea"); qmlRegisterType<QQuickSpinBoxValidator>(private_uri, 1, 0, "SpinBoxValidator"); |