aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Add QQuickContainer::contentChildrenChanged() notifierJ-P Nurmi2015-09-093-1/+39
| | | | | | | Makes possible to bind contentChildren to ExclusiveGroup::checkables. Change-Id: Idf9afabb93f78b012d2ca5c77fe79f34bf76e584 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickContainer: update variable namesJ-P Nurmi2015-09-091-6/+6
| | | | | | | | This piece of code was promoted from QQuickTabBar to QQuickContainer at some point -> "bar" looks confusing. Change-Id: I8e1c1c2233bf34ed3cfacbc539aeb98c2a945012 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use QtQuick.TemplatesJ-P Nurmi2015-09-0932-180/+157
| | | | | Change-Id: I3d1822457efd740e7c9d91747e978d787c0dd4b8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Add QtQuick.Templates QML pluginJ-P Nurmi2015-09-095-1/+1609
| | | | | Change-Id: I32e7fa8b3610b793ca88cb17bd3fbc4f447838ff Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* sync.profile: do not depend on dev branchLiang Qi2015-09-091-4/+4
| | | | | Change-Id: Ic8d1dae7971611d6598d2ff74570f01755a97dce Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Add missing QLocale includeFrederik Gladhorn2015-09-093-0/+3
| | | | | Change-Id: I5b0f8f130202506f4b7be595043c4dfa77768495 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Extras: merge C++ lib to the QML pluginJ-P Nurmi2015-09-0827-112/+25
| | | | | Change-Id: Idbbe9e0cf1b5b34027035a417fade7b0091da8c5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: merge C++ lib to the QML pluginJ-P Nurmi2015-09-0821-113/+26
| | | | | Change-Id: I7eeb0335fd88002c85f93136fc71dfb394788421 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Correct \inherits command in Tumbler documentation.Mitch Curtis2015-09-071-1/+1
| | | | | | | | It inherits Control, not Container. Task-number: QTBUG-47754 Change-Id: I6830ede0038a7be38db85ff1ad1f71030524c09f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* SwipeView: emit currentItemChanged().Mitch Curtis2015-09-052-0/+28
| | | | | Change-Id: Iacbc9cc7f89aeacbf1ce918eb28a1a5c7db7040d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ApplicationWindow: remove contentWidth/HeightJ-P Nurmi2015-09-053-70/+1
| | | | | | | | | | | | | | As illustrated by QTBUG-48072, setting Window.minimumWidth and Window.minimumHeight automatically may cause very unpleasant surprises. Qt Quick Controls 2.x gives the user direct access to the header and footer items, so they can easily calculate the desired minimum, default and maximum sizes for the window. Change-Id: I974566ee81af63a3e9cfd0fa1c1fa36e3989548a Task-number: QTBUG-48072 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* SwipeView: don't override initial currentIndex.Mitch Curtis2015-09-052-1/+28
| | | | | | | | | | | When insertItem() was called for the first time as a result of "statically" declared SwipeView children, the currentIndex would be changed to 0. We should only do this if the currentIndex is invalid (-1), otherwise we disrespect the user's settings. Change-Id: I692b60581e706edcfa4939bbe59a815ff3e019e5 Task-number: QTBUG-48086 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickControl: add font propertyLiang Qi2015-09-0211-35/+655
| | | | | | | | | When the font of a QQuickControl subclass is set, it will propagate it to all children that are also derived from QQuickControl, as well as TextField and TextArea. Change-Id: I7c851f84b89609094d9a81d239ade0f0ac212985 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Minor doc improvementsFrederik Gladhorn2015-08-312-9/+8
| | | | | | | | Do not use fun abbreviations such as look'n'feel, but make it proper boring English. Change-Id: I6369058a455c04e0fc13b5bfff18f4e45b940c20 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* tst_StackView: verify created control instancesJ-P Nurmi2015-08-311-0/+17
| | | | | | | ...like in all other tests. Change-Id: Ia713226f535bca3b6ab731d9441bb5d1b7f9c6f2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* StackView: fix ownership issuesJ-P Nurmi2015-08-285-2/+105
| | | | | | | | | | | | | | | | | | | QTBUG-47317 revealed that dynamically created items remained visible after popping, so they were not only kept visible but also weren't properly destroyed. The visibility issue had to be fixed so that "indestructible" (not owned by StackView) were hid. This change tackles the destruction part, and marks pop-exit items for removal so they get destroyed when transitions are finished. Now that the transitionable items are actually destroyed, a new problem was releaved. We must not delete transitionable items until both enter & exit transitions have been finished. If we did that, the finished() callback would not get called for the pop-exit transition and tst_StackView::test_transitions() would fail (yay). Change-Id: Ie2eedf99d0366820260776591ad1f8b5b68e2ec3 Task-number: QTBUG-47317 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix tst_textfield test_pressAndHold() skipJ-P Nurmi2015-08-281-1/+1
| | | | | | | Change-Id: I1ceb0d2bd269c66a5663dab258698e1eddbd7d25 Task-number: QTBUG-47963 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Make examples return -1 on load failures.Friedemann Kleint2015-08-285-0/+10
| | | | | | | | Avoid hanging processes and empty windows in case some module is not installed. Change-Id: I26c0b0fafc87ae17719850ad06f13c946f099dd9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add a Qt Quick Controls porting guide.Mitch Curtis2015-08-282-1/+119
| | | | | | | | This can start off as just a table, but could be extended to its own doc page with snippets for each control type. Change-Id: I32ed00ebf7634c09f3c513c357b0ff6c6341c7ed Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* GifRecorder: add some indication of when recordings are finished.Mitch Curtis2015-08-281-0/+13
| | | | | | | | | | This is important for high quality recordings, where there is some conversion that must be done after the recording. If we don't do this, it's hard to get a good idea of when the recording actually finishes. Change-Id: Iafb73358288e50d8f070607f8d69602da6d32506 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add "Differences between Qt Quick Controls" section.Mitch Curtis2015-08-282-1/+110
| | | | | | | | | This will be seen immediately by users when they come to see what the controls are all about. It's good to be transparent about why the controls exist and why/when you'd want to use one module over the other. Change-Id: If5e891583d28bfb3b8f1ffd6d6e10846fb6f16a7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* StackView: fix initialization of itemsJ-P Nurmi2015-08-273-27/+27
| | | | | | | | | | Only items that were created from pushed components were initialized. This change fixes item initialization for StackView::initialItem and pushed items. Change-Id: I6fe1afa233e63320180dfe8eac3874fed69cbb3b Task-number: QTBUG-47318 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* StackView: fix transitionsJ-P Nurmi2015-08-272-3/+50
| | | | | | | | | | | Passing null view bounds for the transitionable exit item helps to kick off the transition as appropriate. Otherwise the view transition item determines in QQuickItemViewTransitionableItem::prepareTransition() that no transition is necessary. Change-Id: Icb664725c4393ef3bb894b71a5912652f82c9da0 Task-number: QTBUG-47949 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix StackView: pushed items still showed up after being poppedJ-P Nurmi2015-08-272-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | This is a partial revert of 6ee9612. The idea was to keep items visible until both transitions had finished. StackView { pushExit: null pushEnter: Transition { ... } } When both transitions had finished, all stack elements (except the current one) were hid. The problem was that in pop & replace operations the exiting item was no longer part of the stack (because it had been already popped out) and therefore was never hid. This change restores the original (intended) behavior that a null transition would equal to an immediate operation. This keeps the code simpler, and makes the behavior consistent in a sense that all items are hidden as soon the respective transition finishes. PauseAnimation can be used to wait if desired. Change-Id: Ia9e78506754bdc18949676f061dbfff28a7128b7 Task-number: QTBUG-47317 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* .gitignore: add tst_applicationwindowJ-P Nurmi2015-08-271-0/+1
| | | | | Change-Id: Id1924e002fd1954cf4f594bdac53101cb3f94ebd Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Skip tst_textfield::test_pressAndHold failing test on OS X.Mitch Curtis2015-08-271-0/+3
| | | | | | Change-Id: I479704184ceff878a239c2ee72d0c0929859b97b Task-number: QTBUG-47963 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Added more content about the StackView usageVenugopal Shivashankar2015-08-251-0/+158
| | | | | | | Reused content from Qt Quick Controls1 StackView. Change-Id: I0d21610ebec0b107a269f5acb9bde98c307f0acb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>