aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add support for a QT_QUICK_CONTROLS_STYLE_PATH environment variableJ-P Nurmi2016-11-162-2/+16
| | | | | | | | | | | [ChangeLog][Controls][Styles] Added support for a QT_QUICK_CONTROLS_STYLE_PATH environment variable, which can be used to specify lookup paths for Qt Quick Controls 2 styles. This allows device manufacturers and Linux distributions to specify a system-wide style installation folder that may be located outside the Qt installation tree. Change-Id: Ic004d693bf6206971da6319d0cc13061b8fd1566 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickAbstractButton::textChange()J-P Nurmi2016-11-162-0/+9
| | | | | | | So QQuickMenuItem can sync its platform menu item. Change-Id: Iee4b63006c5586417b6484e24f1503d3c4a7fcad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-155-3/+33
|\ | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpopup.cpp Change-Id: I227b071476e569d13eebd7d11ed041fe30daa389
| * Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-151-0/+4
| |\ | | | | | | | | | Change-Id: I4a3971034d8e6daf0285c4bc9e5612b5e6cdabf1
| | * Doc: Popup.CloseOnRelease* policies only work with modal popupsMitch Curtis2016-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Non-modal popups don't accept the press event because they don't want to block the press. Change-Id: If4e39fe655401e55949e73c40e93626b84d4878a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Dialog: emit rejected() when closed interactivelyMitch Curtis2016-11-101-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what QDialog does, for example. This allows applications to perform some actions that must be done when the dialog is closed. For example, clearing any unsaved changes in a shortcut editor dialog. [ChangeLog][Controls][Dialog] Dialog now emits rejected() when closed interactively. Task-number: QTBUG-56928 Change-Id: Iad4e2fe984323d0b9fdfd17ee3746043b5eaf849 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Prepare for a change to itemGeometryChangedErik Verbruggen2016-11-092-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | In an upcoming patch for qtdeclarative, the rectangle passed to itemGeometryChanged will be the old geometry instead of the difference between the old an the new geometry. Change-Id: If096d4986900fea6ada10b18088de12490c9171b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/devJ-P Nurmi2016-11-11106-331/+1599
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-03106-331/+1599
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/ProgressBar.qml src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquickstackview.cpp Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
| | * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-0313-78/+422
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/accessibility/tst_accessibility.cpp Change-Id: I8c3ccb301730ecdc0acdcb75de607cdd4f753e15
| | | * ScrollIndicator: fix documentation review findingsMitch Curtis2016-11-033-3/+137
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia742b82e9aaacb35cdde5087ccb1deb977af51ed Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | | * ScrollBar: Fix documentation review findingsMitch Curtis2016-11-033-2/+142
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83703bf0188aa52b873f717b3470ceba4a4d670e Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | | * QQuickComboBox: key searchJ-P Nurmi2016-11-031-39/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * QQuickComboBox: handle Home and End keysJ-P Nurmi2016-11-031-31/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ComboBox] Added handling for Home and End keys. Change-Id: I79ec0644f169503ab38a8e2bee18621a1f671478 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Popups: use "Dialog" accessible roleJ-P Nurmi2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayeredPane is described as "an object that can contain layered children, e.g. in a stack". There is no plain "Popup" accessible role. The closest match is "Dialog". Change-Id: I3fca381a953231ff3339ce05e5a00c82f47ba6e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * SwipeView: fix accessibility supportJ-P Nurmi2016-11-023-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't specify the role in QML, because using the Accessible attached property creates a hard dependency to the accessibility feature (the QML code won't run when QT_NO_ACCESSIBILITY is defined). Change-Id: Ie540c915547fae94705873292368652e3608c9e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * StackView: provide accessible roleJ-P Nurmi2016-11-022-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAccessible::LayeredPane: An object that can contain layered children, e.g. in a stack. The same accessible role is used by QStackedWidget. Change-Id: Ia1f96afd5e084958538356e3d9033a3d88cf03c3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Doc: add more verbose brief description for DialogJ-P Nurmi2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55904 Change-Id: Idd505e2d953cef237a8b7e90d8db22e746dedea8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Doc: add RoundButton to the guidelines for buttonsJ-P Nurmi2016-11-021-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55904 Change-Id: I0c2343238e95a318d97e6d01584714e034696512 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | QQuickDialog: finish accessibility supportJ-P Nurmi2016-11-022-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f1e983 added support for controlling accessible properties via QQuickPopup, so now QQuickDialog can set its title as the accessible name the same way QQuickPage does. Change-Id: Iead1e65a10ec16fbbae8383edb6fa3a77a83d4fe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-0293-242/+1107
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Drawer.qml src/imports/controls/Frame.qml src/imports/controls/GroupBox.qml src/imports/controls/Page.qml src/imports/controls/Pane.qml src/imports/controls/ToolBar.qml src/imports/controls/Tumbler.qml src/quicktemplates2/qquickapplicationwindow.cpp src/quicktemplates2/qquickpopup.cpp tests/auto/accessibility/data/busyindicator.qml tests/auto/accessibility/data/button.qml tests/auto/accessibility/data/checkbox.qml tests/auto/accessibility/data/control.qml tests/auto/accessibility/data/dial.qml tests/auto/accessibility/data/label.qml tests/auto/accessibility/data/menu.qml tests/auto/accessibility/data/pageindicator.qml tests/auto/accessibility/data/popup.qml tests/auto/accessibility/data/progressbar.qml tests/auto/accessibility/data/radiobutton.qml tests/auto/accessibility/data/rangeslider.qml tests/auto/accessibility/data/scrollbar.qml tests/auto/accessibility/data/scrollindicator.qml tests/auto/accessibility/data/slider.qml tests/auto/accessibility/data/spinbox.qml tests/auto/accessibility/data/switch.qml tests/auto/accessibility/data/tabbar.qml tests/auto/accessibility/data/tabbutton.qml tests/auto/accessibility/data/textarea.qml tests/auto/accessibility/data/textfield.qml tests/auto/accessibility/data/toolbar.qml tests/auto/accessibility/data/toolbutton.qml tests/auto/accessibility/tst_accessibility.cpp Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
| | | * Doc: tweak BusyIndicator's GIFJ-P Nurmi2016-11-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it running at start to ensure that the first frame serves as a good screenshot. When GIF animations were disabled (Qt Creator), the first frame was empty. Change-Id: I2a0acf0cf428a0175c141a7841ec327bc15dfade Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: revise brief descriptionsJ-P Nurmi2016-11-0237-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7bdd4c11aaeb2df87622c769b1a65ac82ac7e73 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: BusyIndicator vs. indeterminate ProgressBarJ-P Nurmi2016-11-022-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48bb051bdfe18923749f71f9f0be39a0361723f5 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: show the non-wrapping Dial GIF in the detailed descriptionJ-P Nurmi2016-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no screenshot in the detailed description. This helps to see right away what kind of control it is. Change-Id: I0ecc585a5e6f650112e88bb3b37a2f5140d41261 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Frame: fix accessibility supportJ-P Nurmi2016-11-022-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I79f06e3a60151ab4e35b6290fbfe022ed20665e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * ToolTip: fix accessibility supportJ-P Nurmi2016-11-022-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4623b1f1ee1e10c4233e89bf42e6720bbf3a5c73 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * QQuickPopup: let subclasses control accessibility attributesJ-P Nurmi2016-11-023-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for QQuickToolTip (text) and QQuickDialog (title). Change-Id: Ia4a4c948548b05e69bd6319228d73c3baed44abe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * GroupBox: fix accessibility supportJ-P Nurmi2016-11-022-0/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifbbc701a996ed9ddb13f7d16843d0af5ee480ca1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Page: fix accessibility supportJ-P Nurmi2016-11-012-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: If7d15d914e35a675dcd456a4aa561a3280c2308a Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * ComboBox: fix accessibility supportJ-P Nurmi2016-11-012-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Icd196b3cd66b5b31a664c845e78953b4606022b7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Doc: add GIF to SwipeView detailed descriptionJ-P Nurmi2016-11-012-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wireframe is still used on the "Navigation Controls" page. Change-Id: I8e8c2bf0f5d46179c115d548efda2ea114a4431e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Get rid of the remaining qdoc markers in the Default styleJ-P Nurmi2016-11-0137-169/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Id90911cbac46d2d68284abca08dc7165ace71113 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: add GIF animation for DrawerJ-P Nurmi2016-11-012-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4c8b5f80e63a322c20caa837632739a3bfee3ee Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: fix review findings for ToolButtonJ-P Nurmi2016-11-014-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id427520a390a2a8cb0bb4ac0f66fef5f96e5b39e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: fix review findings for ApplicationWindowJ-P Nurmi2016-11-011-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a164e1a306db960c1ac3012b72106425a380e75 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * QQuickPopup: use QShortcutMap to grab Back & Escape keysJ-P Nurmi2016-11-013-11/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes CloseOnEscape play well together with QML Shortcut, as illustrated by the Gallery example. For example, navigate to any control page, open the options menu, and hit escape twice. First, the options menu closes, and then the stackview navigates back. Another nice example is to open the style combobox in the settings dialog, while being navigated to one of the control pages, and hit escape three times. First, the combobox closes, then the settings dialog closes, and finally, the stackview navigates back. NOTE: tst_combobox had to be updated, because it was assuming that the popup is closed when escape is released. Now that the system is based on shortcut overrides, it gets closed on press instead. Task-number: QTBUG-56562 Change-Id: I8b8901bcba7deebd82b181af42f335d95a7cb469 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: fix review findings for PopupJ-P Nurmi2016-10-313-11/+528
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8494ffe1a46a05a01d31787783b5f8e9cc810f36 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: mention that some SwipeDelegate::swipe properties are read-onlyJ-P Nurmi2016-10-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9eeecc73cd3fa6d4fd8aa17abb38c4dc03f2024 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: add links to ToolTip attached properties and methodsJ-P Nurmi2016-10-311-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9edcf69ca4a36f9e50e03787fe82b79aca9d2a3 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: fix some review findings for TabBarJ-P Nurmi2016-10-311-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5c8c4e4554f3171537184114c25724179843b5e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Fix Shortcut to respect modal popupsJ-P Nurmi2016-10-314-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Gallery example, the back navigation shortcut no longer activates when the settings dialog or the about dialog is open. Notice that the back navigation shortcut still activates while the options menu is open. [ChangeLog][Controls][Popup] The QML Shortcut type from QtQuick has been fixed to respect modal popups from QtQuick Controls 2. Task-number: QTBUG-56562 Change-Id: I4c3c762e9db0935ef250ff9f8c553e7d211220c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| | * | Add missing QQuickDialog::accessibleRole()J-P Nurmi2016-11-012-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I49ab38361e3165d4ee4722c5af1404cdd145246b Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update plugins.qmltypesJ-P Nurmi2016-11-012-10/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: I859bcc03f3f980fd37df756c2922378c0d8c0827 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | QQuickStyle::availableStyles()J-P Nurmi2016-11-103-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to introduce platform-specific styles, such as the iOS style, and make them appear correctly in the Gallery example so that we don't have to hard-code the lists separately for different platforms. [ChangeLog][Controls][QQuickStyle] Added availableStyles() method that returns the list of available built-in styles. Change-Id: Ieea88577f402cbc52a844d6777e64c6bd55c5ab9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | QQuickComboBox: ensure a parent for delegatesJ-P Nurmi2016-11-094-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to replace the "width: control.popup.width" expressions with "width: parent.width" to avoid explicit references to the popup. Next, we are ready to defer the execution of the popup until it becomes visible or is accessed by the user. Without the parent item fix, ComboBox throws an error: ComboBox.qml:58: TypeError: Cannot read property of null ...and tst_snippets fails => tested implicitly. :) Change-Id: Ib9cfcf7558addbe3403d835d3ae11b6c11c2f0cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | | Add QQuickComboBox::downJ-P Nurmi2016-11-096-13/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to replace all "control.pressed || popup.visible" expressions with "control.down", and takes us one step closer to deferred popop execution as mentioned in the previous commit. In order to be able to defer the popup execution, we must get rid of such explicit references to the popup. Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Improve the custom ComboBox exampleJ-P Nurmi2016-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cut the dependency between the popup and its content item. The same was done for all the built-in styles in 50148c6. Task-number: QTBUG-56297 Change-Id: I18d83bd5dd92cd4f2798ac17b469725d08368da9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Material ComboBox: remove last explicit references to the popupJ-P Nurmi2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I072079b1fdd0e36fd316d44f3f63a9a4bb29acd9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Default: prepare ComboBox for deferred popup executionJ-P Nurmi2016-11-041-4/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plan is to defer the QML execution of the whole ComboBox popup until the popup is made visible or accessed by the user. This can slice off roughly half of the creation time. The QML engine refuses to defer the execution if there are any child objects that have an identifier, because those child objects could be referenced from outside the deferred/missing parent object. For this reason, we must kill the unnecessary ID. This change alone does not defer anything, but is a prerequisite for enabling deferred execution later. Flickable overrides Item's default property to flickableData, which ensures that children get re-parented to Flickable::contentItem, but ListView overrides the default property back to Item::data, so the parent assignment is not necessary at all. The rest can be done by referencing parent instead of the ID. The other styles do not have ID's within the popup. Change-Id: Iac58bae7e99252fb03bed2228153483300901720 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>