aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/calendar
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in description of qquickcalendar.cppMarco A. Piccolino-Boniforti2016-11-301-1/+1
| | | | | | Change-Id: I7e21c1aeaa205c1dd4e7985837897899e7a39b11 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Restructure the docs to separate the experimental labs QML typesJ-P Nurmi2016-08-0916-0/+362
| | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-091-0/+24
|\ | | | | | | Change-Id: Ifff470774347041d1638fb1da277a8cc11a00db6
| * Doc: missing signals in MonthGridJ-P Nurmi2016-07-081-0/+24
| | | | | | | | | | Change-Id: I1efa6da9ededb87d9629a0f7b1ea53487e4a6bcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: improve the module descriptionsJ-P Nurmi2016-06-291-4/+4
| | | | | | | | | | | | | | | | | | Mention the Qt version that each QML module was introduced in, and emphasize the experimental status of the Qt Labs Calendar module. Qt Labs Platform already does both of these. Change-Id: I103e564b6f7746116a3d40eefb7f2f978e644546 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Reorganize templates & calendar docsJ-P Nurmi2016-06-212-0/+109
|/ | | | | Change-Id: I0e7a20805fe4823564ee2b312a635d08fa978327 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/doc/qtlabscontrols.qdocconf src/imports/controls/doc/qtquickcontrols2.qdocconf src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp src/imports/controls/qtlabscontrolsplugin.cpp src/imports/controls/qtquickcontrols2plugin.cpp src/imports/templates/qtlabstemplatesplugin.cpp src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I6159e681b77e4a0a293b6bd7fb11a46d58873da0
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: Ie2b5a93f0b6ed16276b80fcb9e118a49a055194c Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Control: rename activeKeyFocus to visualFocusJ-P Nurmi2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | This is a bit more flexible, because the name is not strictly coupled with key focus. We can even add a (re)setter later if we want. This change only renames the property. Change-Id: I6707e44040f584480a8712df1af0915ae2829d57 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update plugins.qmltypesJ-P Nurmi2016-04-211-0/+4
| | | | | | | | | | Change-Id: I38729bb888c4a8df797dfac056c5b025a6d9a67f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-201-3/+3
|\| | | | | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
| * Calendar: fix docsNikita Krupenko2016-04-161-2/+2
| | | | | | | | | | Change-Id: Ia0b2134e4de48ca595d63456586e471c46151ce8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Calendar: fix wrong signal on 'to' property change in CalendarModelNikita Krupenko2016-04-161-1/+1
| | | | | | | | | | Change-Id: I7c3cdbbe02c71c5341684c3d9da9f1d9b0222136 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-137-7/+7
| | | | | | | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-187-7/+7
| | | | | | | | | | | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-02-254-9/+35
|\| | | | | | | | | | | | | Conflicts: src/templates/qquickrangeslider_p.h Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
| * Doc: fix typos in Qt.labs.calendarJ-P Nurmi2016-02-233-3/+3
| | | | | | | | | | Change-Id: I13329270602d5b6e59d92dc412d72b2c4714c6c2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Fix CalendarModel month indicesJ-P Nurmi2016-02-231-6/+32
| | | | | | | | | | | | Change-Id: I25c683cce19436d103d3225ad098daedf6212b64 Task-number: QTBUG-51108 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update plugins.qmltypesJ-P Nurmi2016-02-221-0/+1
| | | | | | | | | | | | Change-Id: I54d19667a4f72c34174b8235f9ae24b533be2209 Task-number: QTBUG-51278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-254-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/templates/qquickcombobox_p.h src/templates/qquickmenu_p.h src/templates/qquickmenu_p_p.h src/templates/qquickoverlay_p.h src/templates/qquickpopup.cpp src/templates/qquickpopup_p.h src/templates/qquickstackview_p.cpp Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
| * Docs: add notes about the Qt.labs moduleJ-P Nurmi2016-01-194-0/+8
| | | | | | | | | | Change-Id: I65c37f661689bf30e7a9119bb877dce68eeb634c Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
| * Doc: fix MonthGrid brief descriptionJ-P Nurmi2016-01-191-1/+1
| | | | | | | | | | | | | | MonthGrid is not a full-blown CalendarView. It might come later. Change-Id: Ie8c6e1d2655769cd632edc376cbb5f068c1bd273 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | C++11 keywordsJ-P Nurmi2016-01-2112-47/+47
| | | | | | | | | | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Imports: replace foreach with range-based forAnton Kudryavtsev2016-01-153-4/+8
| | | | | | | | | | Change-Id: I31bc93c2b3f6ecbd0680dc9d626626c4fe57eec8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Support static buildsJ-P Nurmi2016-01-131-0/+13
|/ | | | | Change-Id: I17bb9131603da912597777b2ec0b9be3894ed858 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Replace Q_DECLARE_TYPEINFO(T, Q_COMPLEX_TYPE) by QML_DECLARE_TYPE(T)J-P Nurmi2015-12-218-16/+21
| | | | | | | | | | | Q_COMPLEX_TYPE tells Qt containers that the type has a ctor/dtor and that it may not be moved in memory using memcpy(). QML types are never stored by value in Qt containers (non-copyable QObjects), so the type info declaration is superfluous. QML_DECLARE_TYPE, however, is useful (QTBUG-49920) and consistently used for all QtQuick types. Change-Id: I3bd1718b306fa7af85a623fa7a17e1b9653d2152 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-12-171-5/+2
| | | | | | | | | The contents of templates/plugins.qmltypes has been manually copied to controls/plugins.qmltypes as suggested in the linked bug report. Change-Id: I6b71af2aa85f6e87f42689018f7814e5c139b7c8 Task-number: QTCREATORBUG-15137 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Control::localeJ-P Nurmi2015-12-076-77/+29
| | | | | | Change-Id: I6c6647de6d286a92b35bca09a45e82cd3343a623 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Cleanup & align the .pro filesJ-P Nurmi2015-11-161-4/+2
| | | | | | | | Remove some superfluous spaces, include paths, and module deps. Also, use more explicit QT_PRIVATE for private dependencies. Change-Id: I85d48213441749ab18442928a20cbb4c9c6dad0b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-10-161-216/+55
| | | | | | Change-Id: Ide6a6166398f82e93f42ca830b074284c5127c8c Task-number: QTBUG-48808 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Flatten tests/auto/snippets/dataJ-P Nurmi2015-10-134-7/+7
| | | | | Change-Id: Ie58e6ee44380900854f5f7c91f7358cb5be0aec7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: improve the documentation about 0-based month numbersJ-P Nurmi2015-10-043-38/+66
| | | | | Change-Id: Ibcd36070b6652ca9c5033265af4415daaba4b3ef Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Calendar singletonJ-P Nurmi2015-10-046-4/+187
| | | | | | | | | | Not yet super useful, as it only contains a Month enum to help with JavaScript's zero-based months. Later on, we can add various calendar related utility methods, such as calculating the next/prev month and so on. Change-Id: I7685eb931833fc0c30e2d5d4fe874d0618d054b4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: kill the controls dependencyJ-P Nurmi2015-10-044-7/+0
| | | | | Change-Id: I98b3d0f7e2ec7e07462ec66d92b082b4db953806 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename CalendarView to MonthGridJ-P Nurmi2015-10-0410-105/+105
| | | | | | | | | | Let's reserve CalendarView for a bit higher level control that combines MonthGrid, DayOfWeekRow and WeekNumberColumn, and provides built-in navigation. CalendarView would use the not-so-extensible CalendarModel internally, so we could get that out of the public API as well... Change-Id: I43126ed4c87f54a5b24129b9d60c969f5bd58642 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: validate month & year rangesJ-P Nurmi2015-10-034-22/+50
| | | | | | | Fixes also all Calendar types to use 0-based month. Change-Id: Iee3cafc00e0338b8076fbb3fe195b8491752cbc1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-10-011-57/+207
| | | | | Change-Id: I6ab27aec6ac86203a64d42482a7327b69b075554 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix qmldir dependenciesJ-P Nurmi2015-10-011-0/+1
| | | | | Change-Id: Ic9583f6cf19a281c4e46b3f9961294774e6c8bb8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-013-3/+3
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-017-7/+7
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Calendar 2.0 to Qt.labs.calendar 1.0J-P Nurmi2015-10-0120-75/+75
| | | | | Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Use a single documentation project for Controls + CalendarTopi Reinio2015-09-3010-148/+0
| | | | | | | | | | | QML types from QtQuick.Calendar module use their own import statement, but in the documentation they can listed as part of Controls. Edit the landing page and module pages to list (or link to) the usage and QML type info for both modules. Change-Id: I4e711a8d7ae84d888736eea59f5e25dadc1d35d5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Initial QtQuick.Calendar docsJ-P Nurmi2015-09-2514-0/+405
| | | | | | | The overview is still missing. Change-Id: I081f1684b64fc8b95f59844b8373293523181266 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Calendar: fix fonts of the default delegatesJ-P Nurmi2015-09-243-2/+5
| | | | | Change-Id: Ia85c9100cd052919f99162bcb1ef63be0b9efb9d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix QQuickDayOfWeekModel::setLocale()J-P Nurmi2015-09-241-3/+1
| | | | | | | | It must emit dataChanged() even if the first day of week of the new and old locales are the same. The names are most likely different. Change-Id: I932215821962910ef1fb8a66f2dab81dcc51a3b1 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Calendar: don't expose MonthModel, DayOfWeekModel, WeekNumberModelJ-P Nurmi2015-09-241-6/+0
| | | | | Change-Id: Ib80bfb5d95c8bee8bcf21e511a704d7da1e9cd83 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-167-7/+7
| | | | | Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: fix compilation with QT_NO_ACCESSIBILITYLiang Qi2015-09-151-1/+0
| | | | | | Change-Id: If840f4bf715b4290fb50388b94e33420505b1a9b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add missing QLocale includeFrederik Gladhorn2015-09-093-0/+3
| | | | | Change-Id: I5b0f8f130202506f4b7be595043c4dfa77768495 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Calendar: merge C++ lib to the QML pluginJ-P Nurmi2015-09-0817-13/+2129
| | | | | Change-Id: I7eeb0335fd88002c85f93136fc71dfb394788421 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>