aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-01322-698/+690
| | | | | 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-01129-340/+340
| | | | | | 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-0159-116/+119
| | | | | Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add PageIndicator::interactiveJ-P Nurmi2015-09-304-2/+151
| | | | | Change-Id: Iecb6d855d1c7710901925097ad4e03006d58309c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Use a single documentation project for Controls + CalendarTopi Reinio2015-09-3013-72/+52
| | | | | | | | | | | 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>
* TabBar: fix implicit sizeJ-P Nurmi2015-09-301-0/+3
| | | | | | | | | | | | Like many other controls, TabBar calculates its implicit size based on the implicit sizes of its content and background items. Because of QTBUG-35038, the default content item didn't have any implicit size specified. Now that the binding loop issue has been fixed, we can specify the missing implicit size for the content, so that TabBar itself gets a sensible implicit size. Change-Id: Iaedc20b57cf613066c3ca3fef34e42eed93a9a1c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* StackView Template: Empty transitions should not crashGabriel de Dietrich2015-09-301-0/+6
| | | | | | | So we make sure a transitioner exists before running any transition. Change-Id: I3ef40e591fdbdcd5b25a5dc53e71551ac13b7531 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Fixes required to avoid the following qdoc warningsVenugopal Shivashankar2015-09-282-2/+2
| | | | | | | | | qtquickcontrols2-index.qdoc:28: warning: Can't link to 'No' qquickstackview.cpp:46: warning: Can't link to 'replace()' Change-Id: I44cc2fab7d6b745175d0cbd3636b8025eb415c70 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename test snippets: qtquickextras2 -> qtquickcontrols2J-P Nurmi2015-09-255-0/+0
| | | | | Change-Id: Ie1cd4e8d6a8bc214e8d21272c527fffed0884217 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Remove ToggleButtonJ-P Nurmi2015-09-2527-761/+6
| | | | | | | | We don't have a sensible design. It's better not to have it at all than to have a confusing tiny bit tweaked clone of Switch. Change-Id: Ib0eabd075590100e9e49846c7172909525b54a57 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Initial QtQuick.Calendar docsJ-P Nurmi2015-09-2522-1/+541
| | | | | | | The overview is still missing. Change-Id: I081f1684b64fc8b95f59844b8373293523181266 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add support for file selector based stylesJ-P Nurmi2015-09-251-28/+31
| | | | | | | | | | | unset QT_FILE_SELECTORS ./app # => selects qtbase/qml/QtQuick/Controls.2/Button.qml export QT_FILE_SELECTORS=Flat ./app # => selects qtbase/qml/QtQuick/Controls.2/+Flat/Button.qml Change-Id: Ib5d6fdcee89c14b2511dce90ea2ac5c077aafa0d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add controls.priJ-P Nurmi2015-09-252-34/+36
| | | | | Change-Id: Iab776ece0035877414626230985bb94edcfba5d8 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix Tumbler font, and TextField & TextArea placeholder fontsJ-P Nurmi2015-09-254-20/+41
| | | | | Change-Id: Ifbc8e0a221b1190becb789d69b9b313ab45e1615 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Calendar: fix fonts of the default delegatesJ-P Nurmi2015-09-246-2/+152
| | | | | Change-Id: Ia85c9100cd052919f99162bcb1ef63be0b9efb9d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix QQuickDayOfWeekModel::setLocale()J-P Nurmi2015-09-246-3/+127
| | | | | | | | 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>
* QtQuick.Controls depends on QtQuick.TemplatesJ-P Nurmi2015-09-241-0/+1
| | | | | Change-Id: Icddc2a863eb1e38978d87a4db77e2f07ac2931b9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Docs: fix non-wrapping Tumbler snippetJ-P Nurmi2015-09-241-0/+1
| | | | | Change-Id: I7482b008ed74b7da0eb58c1114b04f8376cda806 Reviewed-by: Mitch Curtis <mitch.curtis@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>
* Templatize the former extrasJ-P Nurmi2015-09-2321-77/+65
| | | | | Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Doc: Replaced the module name qualifier used for QML docsVenugopal Shivashankar2015-09-2324-150/+150
| | | | | | | | Also made changes to avoid qdoc warnings about qml snippets. Change-Id: Ide047fe7a4901fcf4b03efdccf457662e60585d2 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Enums are now available using the QML composite type nameJ-P Nurmi2015-09-233-67/+66
| | | | | | | Change-Id: I90cf20d57ee433c1c9319c7a947ac91558775bb7 Task-number: QTBUG-43582 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Show the version in QML module \briefTopi Reinio2015-09-231-1/+1
| | | | | | | | | This is a workaround for distinguishing between QtQuick.Controls version 1 and 2 in 'All QML APIs by Module' (modules-qml.html) page, which currently shows identical entries for the two. Change-Id: I4d0bbb201784def3056a57898e1ac619109b9a52 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add 'Preparing for Migration' section to docs.Mitch Curtis2015-09-221-0/+18
| | | | | | | | | While working on a personal project using Qt Quick Controls, I realized that putting each custom-styled control into its own file would ease the transition to Qt Quick Controls 2. Change-Id: Ic3cbf822d40d63e9cccf3c93d049dc15b1acb63f Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* Controls: move Accessible from QML to C++ for DialLiang Qi2015-09-214-3/+19
| | | | | | Change-Id: I95604be3b31bc69f7ac3f7ed8ff444833713b67d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-09-191-0/+1
| | | | | Change-Id: Idb66ae1aba88c7d8ee4077d4e5e2750a05c13bac Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: fix font rendering in Label, TextArea and TextFieldLiang Qi2015-09-186-35/+29
| | | | | Change-Id: I264e0b86dcf54623b545d695f1a23f7d4a08972b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge Qt Quick Extras into Qt Quick ControlsMitch Curtis2015-09-1865-603/+126
| | | | | | | | | | | | The original split existed because the public and enterprise controls were developed separately. Now that all controls are public and developed together, the split no longer makes sense and is difficult for users to understand. Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Tidy up QQuickControlPrivate::updateFontRecur() a bitJ-P Nurmi2015-09-181-17/+12
| | | | | Change-Id: I420c48e95380f79c4d4f3aaa40f7f65f1646834d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Add QQuickControlPrivate::get()J-P Nurmi2015-09-182-1/+6
| | | | | Change-Id: Ide0e32f5a91d866cb45a96414713facba3d48e6c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Add the GPLv3 license textThiago Macieira2015-09-182-0/+688
| | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* test: add activeFocusOnTab into auto testLiang Qi2015-09-182-2/+1
| | | | | Change-Id: Idf65a4859d012e290b5614ef84063de9540d29b9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-09-181-0/+1
| | | | | Change-Id: Ia8b12afe818f1806d3c258fa97b1a37de7c23b14 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: fix activeFocusOnTabLiang Qi2015-09-174-1/+645
| | | | | | | Autotest is included, except ScrollBar and StackView. Change-Id: Idfbf031451ff3b244cd7f538c7210f0c242482ac Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Move currentIndex, add/insert/removeItem to QQuickContainerMitch Curtis2015-09-177-151/+105
| | | | | Change-Id: I6bb2adb4de972bb62f0e72c80cc50cf90964631f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: move qtquickcontrols qdoc files in the right placeJ-P Nurmi2015-09-1675-7/+8
| | | | | Change-Id: I864eaf25f586c49c03708fb83e8e99b115cdb3a7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-16164-149/+149
| | | | | Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* SwipeView: add index, view and isCurrentItem attached propertiesMitch Curtis2015-09-165-4/+302
| | | | | | Task-number: QTBUG-48052 Change-Id: I0d6d27cc352d999d8071b979349f2364f0edf74d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: fix compilation with QT_NO_ACCESSIBILITYLiang Qi2015-09-158-2/+86
| | | | | | Change-Id: If840f4bf715b4290fb50388b94e33420505b1a9b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: Make all internal text elements use control.fontLiang Qi2015-09-1514-2/+170
| | | | | | Change-Id: I3469277e9dd413a483c82be11fd661a890fab5ba Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Ensure press-and-hold event keeps selectionGabriel de Dietrich2015-09-157-99/+217
| | | | | | | | | | | | | | | | | | | | This concerns TextField and TextArea. It is an almost universal UX pattern on touch platforms where the user long presses to pop the context menu up. In many cases the context menu is used for copy and cut operations, which means that poping it up should keep the selection. The implementation works by not forwarding the initial mouse press event to the parent class until we're sure it's not going to be a long press. If the long press timer is cancelled for any reason, we will then send the delayed mouse press event to the parent class followed by whichever event triggered the cancellation. Auto-tests refactored and updated. Change-Id: If3aa8075f07a80929f4bd723895d9599bf8d169e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickStackView: fix buildLiang Qi2015-09-152-3/+2
| | | | | | | error: no member named 'qmlGlobal' in 'QQmlV4Function' Change-Id: I45610c13e634b341fe5a77a37a05633f5f211f0c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-09-141-0/+1
| | | | | Change-Id: I948abfd5c7b2b34a176e669b2475f92e90475804 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Register types in C++ (instead of qmldir)J-P Nurmi2015-09-144-26/+55
| | | | | | | | | | | | | | Later on, we can choose to register types from different style-subdirs based on a yet unknown style selector (app manifest file, env var, ...) This is also a step to the right direction to get QML types inherit enums and attached properties from the respective C++ base types. The qmlRegisterType(QUrl) overload for composite types probably needs a template argument to help figure out the missing meta-object link between the composite type and the C++ base type. Change-Id: I9b3c2afdd93fff56d1e7513879b3e9229f483cbf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* theme example: replace the useless Control(+Rect bg) with a plain RectJ-P Nurmi2015-09-141-4/+2
| | | | | Change-Id: If2880cb3d25d4d1ca061913a41bf2a8f36c48012 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: move Accessible from QML to C++Liang Qi2015-09-1470-77/+747
| | | | | | | | | | | Controls 2.0 could be built with QT_NO_ACCESSIBILITY defined. Added a few helper functions for accessible in QQuickControl. Don't set text as Accessible.name for TextArea and TextField. Change-Id: I40383bbcec2f8c742f709bdec0209623f80da449 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Apply QQuickControl font behavior to QQuickLabelLiang Qi2015-09-146-13/+180
| | | | | | | In 0addfd5d, we missed QQuickLabel. Change-Id: Icc352f8db04b2b981d386513454650e376f0a955 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix typo in qmldir classnameMitch Curtis2015-09-141-1/+1
| | | | | Change-Id: Id6add5fb834fe7b0d758a253ef53d2c4b204ba9e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add missing QColor includeLiang Qi2015-09-111-0/+1
| | | | | | | Fix complilation with -no-pch option. Change-Id: I169c39cf51cb6d3776636f043553ac3bf17a068d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ExclusiveGroup::checkablesJ-P Nurmi2015-09-103-14/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | Exclusive checkables typically share the same parent item. For example, a row or column positioner or layout. This change makes it convenient to handle such cases so that one can add the whole list of children to an exclusive group, without the need of creating any attached objects. Column { id: column ExclusiveGroup { id: eg checkables: column.children } Switch { id: s1; text: qsTr("First") } Switch { id: s2; text: qsTr("Second") } Switch { id: s3; text: qsTr("Third") } } Last but not least, this allows breaking the C++ dependency between QQuickTabBar and QQuickExclusiveGroup. Change-Id: Ic75065b87ef8fa532f77118d740f04484994bbf0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>