aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/calendar
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-057-0/+0
|\ | | | | | | Change-Id: I4b970036bdb5d312b0dc5cb1bcbd8e161e3d4c7e
| * Run optipng on all imagesMitch Curtis2019-11-047-0/+0
| | | | | | | | | | | | | | | | find . -name "*.png" -exec optipng -o 7 -strip all {} \; Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d Fixes: QTBUG-79275 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypes for 5.14Kai Koehne2019-10-211-0/+274
|/ | | | | | Task-number: QTBUG-78690 Change-Id: I0e421232f4335a7a351562f23134eccdd0b1c674 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Replace the "Qt Quick Controls 2" instancesVenugopal Shivashankar2019-08-222-3/+3
| | | | | | | | | Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | Task-number: QTBUG-74391 Change-Id: I354049c5c8edb36cb94afa4483ae177a736f2374 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-071-1/+22
| | | | | | | Task-number: QTBUG-73484 Change-Id: I5c6019ec015a7d423dcc103d1acf23383c5b6239 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-0210-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-291-1/+4
| | | | | | | | | | The name of the documentation module is also changed from 'qtquickcontrols2' to 'qtquickcontrols', and this is reflected in other modules' dependencies and licensing source files (qt_attribution.json). Task-number: QTBUG-70333 Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+0
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ic3fa0827ee6719b0a22f73b48667deb129089a6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2017-11-061-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickchecklabel.cpp src/quickcontrols2/qquickchecklabel_p.h src/quickcontrols2/qquickmnemoniclabel_p.h src/quicktemplates2/qquickbuttongroup_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquickswipedelegate.cpp Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
| * Update plugins.qmltypesJ-P Nurmi2017-10-251-0/+2
| | | | | | | | | | Change-Id: Ie5b9a513baa70e88ade9cc4980b81fe6a363edf6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump import versionsMitch Curtis2017-09-193-3/+3
|/ | | | | | | | This brings all QtQuick 2.x and QtQuick.Controls.x 2.x imports in src/ up to 2.11 and 2.4, respectively. Change-Id: Ica2413b85f5da62a495a5d1b02ea54a9a92c0ecb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-292-39/+40
|\ | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickmenu.cpp Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
| * QQuickMonthGrid: fix touch supportJ-P Nurmi2017-06-262-39/+40
| | | | | | | | | | | | | | | | | | | | | | | | QQuickMonthGrid lost its clicked() signal when multi-touch support was added to QQuickControl, because QQuickControl now accepts touch events and therefore QQuickMonthGrid no longer gets synthesized mouse events. Re-implement QQuickControlPrivate::handlePress/Move/Release/Ungrab() instead of QQuickControl::mouseXxxEvent() to gain multi-touch support. Task-number: QTBUG-61585 Change-Id: Ic6fb2ea0b43b2b44beb0d8fdd3335a20f7c028f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-201-0/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ApplicationWindow.qml src/imports/controls/material/ApplicationWindow.qml src/imports/controls/universal/ApplicationWindow.qml src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
| * Enable the use of QML caching at build timeSimon Hausmann2017-05-191-0/+2
| | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: Ia6aeb27d4af695fcfc987e944c73d49364fd440e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Plugins: add missing override keywordsJ-P Nurmi2017-05-161-1/+1
|/ | | | | Change-Id: Ic43604fdb601769e93618cac30d839cc524f1394 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Set explicit cursors on all interactive controlsJ-P Nurmi2017-04-051-0/+3
| | | | | | | | | | | | For example, if you have a floating button on top of a text editor, hovering the button must change the cursor from the editor's ibeam cursor to an arrow cursor. This applies to all interactive controls that call setAcceptedMouseButtons(). If a control blocks mouse events, it should not use some random cursor from another control underneath. Task-number: QTBUG-59629 Change-Id: I8a6ae306bbc76a9b22377361cb19cf9c3a872d31 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-249-36/+36
| | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QtQuickControls2: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-132-4/+4
| | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I94123464b12b30a4ba085cfb7b606bc26df9b76e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Welcome to 2017J-P Nurmi2017-01-0929-29/+29
| | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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>