aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* testbench: remove hovered states as the property is read-onlyv5.11.0-alpha1Mitch Curtis2018-02-142-12/+1
| | | | | Change-Id: Iebc19620b34d9a8a7cc954c9486b739eed1de4a4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* testbench: set checked on ButtonMitch Curtis2018-02-141-0/+1
| | | | | Change-Id: Ic63b9c17318b357f4f34a5c49ff3d27bb438856c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickStackView: transfer focus to the current itemJ-P Nurmi2018-02-131-10/+21
| | | | | | Task-number: QTBUG-51321 Change-Id: I169491d3e04f3ce015f5a999935f45ec02b1b5ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge tst_drawer.qml to tst_QQuickDrawerJ-P Nurmi2018-02-132-118/+37
| | | | | Change-Id: I837f6991f5a3b66e3ded9e1408656013a0803d8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_QQuickPopup: run with all stylesJ-P Nurmi2018-02-121-37/+51
| | | | | Change-Id: I0f48ef8bbf0cb7567796dc67f1030d274f684d67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_QQuickDrawer: run with all stylesJ-P Nurmi2018-02-121-1/+2
| | | | | Change-Id: I3cbd5aa20f48051ab80cf7e83661f17010129450 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-123-15/+299
|\ | | | | | | Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
| * Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-092-0/+93
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia407f277cccfdd96242ebfdbe294d699e26e6b1d
| | * QQuickControl: respect wheel focus policy for focus scopesJ-P Nurmi2018-02-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Control] Fixed focus scope controls to respect wheel focus policy. Task-number: QTBUG-66133 Change-Id: If963feba4b6e59b87ca54af5f6606805093eb0cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Popup: fix restoring focus for popups that did not request focusJ-P Nurmi2018-02-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup closes, if it has active focus, it should restore focus back to where it was regardless of whether the popup originally requested focus. Even if a popup does not request focus on open, it may gain focus programmatically or when a control with click-focus is clicked, for example. Task-number: QTBUG-66113 Change-Id: I9a7c467abe781bbef390d74898d13b9a30b2695b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * QQuickControl: respect click focus policy for focus scopesJ-P Nurmi2018-02-051-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a focus scope explicitly requests click focus, make it gain active focus by clearing the sub-focus child. Pane { focusPolicy: Qt.ClickFocus TextField { } } [ChangeLog][Controls][Control] Fixed focus scope controls, such as Frame, GroupBox, Page, and Pane, to respect click focus policy by clearing a potential sub-focus child. This makes it possible to close the virtual keyboard by clicking the background of a Pane that has Qt.ClickFocus set as its focusPolicy, for example. Task-number: QTBUG-66133 Change-Id: I582f3c66aa6f11e229d89c4f610fae3c6259104d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Make AbstractButton's icon properties win over Action's when both are setMitch Curtis2018-02-051-15/+206
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65193 Change-Id: Idff23dcc35f3c3fe41406678613b022098149318 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into 5.11J-P Nurmi2018-01-316-0/+63
|\| | | | | | | | | | | Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-312-0/+22
| |\| | | | | | | | | | Change-Id: I697f98d5214f487c915032d744ec593da05368a8
| | * QQuickComboBox: fix popup's deferred executionJ-P Nurmi2018-01-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other delegates, such as background and contentItem, popup is not unconditionally executed upon component completion. For performance reasons, its execution is delayed until the popup is needed, that is, the popup is accessed or shown. When the popup is accessed, we use the current completion status via isComponentComplete() to determine whether its execution must be completed immediately, or if we can wait until componentComplete(). However, if the popup was accessed while the combobox itself was being completed (used in ComboBox's bindings), the popup was never completed because isComponentComplete() was still returning false even though the popup was actually being indirectly accessed from componentComplete(). A simple execution order change, to complete the combobox itself before the popup, fixes the problem. Task-number: QTBUG-65962 Change-Id: I4764eb7e273e7f6fa1dab1a65a02b87722ee7cba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Control: fix background size regression caused by deferred executionJ-P Nurmi2018-01-221-0/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65880 Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | tst_qquickiconlabel: skip colorChanges() that grabToImage() on offscreen ↵Liang Qi2018-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Change-Id: Ifac43dfa26182e3b518397fa070bb4d4a62114e0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | tst_qquickiconimage: skip tests that grabToImage() on offscreen platformsMitch Curtis2018-01-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Task-number: QTBUG-65975 Change-Id: I037110408bd7b676d6ca142808774b29d1aa749f Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Fix test_itemsCorrectlyPositioned() failureMitch Curtis2018-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that "moving" is false before comparing the y position of the delegate item. Change-Id: Ie23e86c1f89180c5afca3a48b9361a82635d5e39 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | Fix Action shortcuts in RepeaterJ-P Nurmi2018-01-221-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickRepeater does not set a QObject-parent, so make QQuickShortcutContext::matcher() start from the object itself and if no window is found, then iterate to the QObject parents. Task-number: QTBUG-65889 Change-Id: I30a1ed0616edd002abcf28d1b8dc7e2d87e99c13 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-25/+37
|\| | | | | | | | | | | Change-Id: I61d779eb40e3a278aa2ef429e014d351da34f80a
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-184-9/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Tumbler.qml src/quicktemplates2/qquicktumbler.cpp src/quicktemplates2/qquicktumbler_p.h src/quicktemplates2/qquicktumbler_p_p.h Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
| | * Make Tumbler compatible with deferred executionMitch Curtis2018-01-174-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the contentItem is created at a different stage, we have to shuffle some code around and add some null checks. Task-number: QTBUG-50992 Change-Id: I34d3a9ea9cb9ab54008a1015b37b1666538c085e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Imagine/Switch(Delegate): cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-4/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I621343bef562b4ed85202a0690a0cccfc0a053c5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/DelayButton: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I5f2708bc0e9f37232b10e2cd6f1c61ab779156e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/ProgressBar: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-4/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I1f31b23f3db23e5582b74b18ed643e8263d99142 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/BusyIndicator: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Idee1a13355e36e9221b32cdf9b89b4090dcf87b4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/GroupBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Ied6b4365d03fc1ef3ae3a69667f1cb1fc8cdb9ac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/SpinBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Iaabd561b2bd009d3db970f370eff6fa717164961 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Revert "Temporarily disable the benchmarks"J-P Nurmi2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96f2a2ae7d3e0f034af57faae3720f20ba45113f. Presumably this is no longer needed. We just forgot to revert the workaround that was supposed to be temporary. Change-Id: I2fe929fa365cfe3a5db53585df278f22cfe030fc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2018-01-16149-256/+6441
|\| | | | | | | | | | | Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
| * | ComboBox: fix popup's deferred execution for the new stylesJ-P Nurmi2018-01-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Same as 3ec6d04d in 5.9, but for the new styles in 5.10. Task-number: QTBUG-50992 Change-Id: I211c0e6c0b290c1af310898f21850f9fad01b278 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Tumbler: cleanup internal IDsJ-P Nurmi2018-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Same as d61567f in 5.9, but for the new styles in 5.10. Task-number: QTBUG-50992 Change-Id: If47df3796eeadb997bfc76ce6dd6a3b14372ff2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵J-P Nurmi2018-01-152-9/+94
| |\ \ | | | | | | | | | | | | refs/staging/5.10
| | * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-152-9/+94
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontrol.cpp tests/auto/sanity/tst_sanity.cpp Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd
| | | * Tumbler: cleanup internal IDsJ-P Nurmi2018-01-111-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can already cleanup the internal IDs even if Tumbler doesn't have deferred execution enabled. Change-Id: Ide9a0a6c6d1680c6df6b968b5702a6270fea3326 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * tst_sanity: check for internal IDsJ-P Nurmi2018-01-112-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65341 Change-Id: I51bd3390a18e50e37dfdd880dfa8df262d478b04 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * tst_sanity: unblacklist ComboBoxJ-P Nurmi2018-01-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox no longer creates a popup instance at construction time. Change-Id: Ie036d75acbd2a7a391c1ed1af590409f4eddd587 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * tst_sanity: exclude internal helper typesJ-P Nurmi2018-01-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test file names against registered QML types to avoid including any internal helper types like CursorDelegate.qml and RectangularGlow.qml. Change-Id: Ia3079ea215eea59f7e405a50c3170fb4530f4239 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | MenuItem: use deferred execution for the arrowJ-P Nurmi2018-01-155-4/+22
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Ifb41a8caf6b406249d6da4783c546816d9b51581 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fusion: eliminate internal IDs to enable deferred executionJ-P Nurmi2018-01-111-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65341 Change-Id: I3bfd36f1d1e275eb507184c376599aa7751a069e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | tst_customization: add data rows for new controls in 5.10J-P Nurmi2018-01-1011-1/+654
| | | | | | | | | | | | | | | Change-Id: I7cf0a01648d95c386cbf916107546e4f46fadc73 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-10134-245/+5680
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/CheckBox.qml src/imports/controls/CheckDelegate.qml src/imports/controls/ComboBox.qml src/imports/controls/DelayButton.qml src/imports/controls/Dial.qml src/imports/controls/ItemDelegate.qml src/imports/controls/MenuItem.qml src/imports/controls/RadioButton.qml src/imports/controls/RadioDelegate.qml src/imports/controls/SwipeDelegate.qml src/imports/controls/Switch.qml src/imports/controls/SwitchDelegate.qml src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc src/imports/controls/material/CheckDelegate.qml src/imports/controls/material/ItemDelegate.qml src/imports/controls/material/MenuItem.qml src/imports/controls/material/RadioDelegate.qml src/imports/controls/material/SwipeDelegate.qml src/imports/controls/material/SwitchDelegate.qml src/imports/controls/qquickdefaultbusyindicator.cpp src/imports/controls/qquickdefaultbusyindicator_p.h src/imports/controls/qtquickcontrols2plugin.cpp src/imports/controls/universal/CheckDelegate.qml src/imports/controls/universal/ItemDelegate.qml src/imports/controls/universal/MenuItem.qml src/imports/controls/universal/RadioDelegate.qml src/imports/controls/universal/SwipeDelegate.qml src/imports/controls/universal/SwitchDelegate.qml src/quickcontrols2/quickcontrols2.pri src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickmenu.cpp src/quicktemplates2/qquickpopup_p.h Change-Id: Ib25c8b4a7fe018b7c0ade9b02bfaaa6980118c15
| | * Add creation benchmarks for qmlbenchJ-P Nurmi2018-01-0547-0/+784
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmlbench repo has benchmarks only for a subset of controls. They are part of a larger collection of benchmarks that are run periodically, for which the results are collected to Grafana. We have limited resources there, so we don't want to overload it with benchmarks for every single control type. However, for our own benchmarking purposes it is useful to be able to easily benchmark all of them. Change-Id: I920e4c07bce8356e5d9f41d4c1d6ae43e37bb13e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Material: cleanup the internal ID from BusyIndicatorJ-P Nurmi2017-12-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as da27cace for the Default style. An internal ID in the OpacityAnimator element prevented deferred execution for the whole content item. Apply the same visibility trick in C++ to avoid having to use an ID in QML. Change-Id: I4b54bbe3044aff9603b1135ac25d7325e01fdff2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix and test deferred execution for Universal & MaterialJ-P Nurmi2017-12-221-3/+6
| | | | | | | | | | | | | | | Change-Id: I8ee27a0c65c9ce8c9cc48c6f59d2b34d02849be8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * tst_customization: comment out Tumbler for nowJ-P Nurmi2017-12-221-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to unclear auto test failurs, Tumbler does not yet have deferred execution enabled for its content item. Because of this, the test is getting full of skips and expect fail's for Tumbler. Just leave it out for now and restore later when Tumbler is fixed. Change-Id: Iab9465e002572d15e5bda6dbd53b71594f593703 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix tst_customizationJ-P Nurmi2017-12-221-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | Fix style selection, and make override() actually fail with internal IDs in the built-in styles. Change-Id: Ied321c46cd74039f84b683fb6df99aef2d488eef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix deferred executionJ-P Nurmi2017-12-2150-6/+3439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QML engine refuses to defer execution of a delegate (it contains an ID), we must make sure to cancel any pending deferred execution for the same delegate. Otherwise, we may end up overriding a custom (non- deferred) delegate with a default (deferred) delegate. This patch adds a new test style "identified" to tst_customization. This style contains delegates with IDs so we can test the behavior with IDs in base styles. Furthermore, overriding delegates is now tested in various ways (with and without IDs in the base and custom styles) in a separate test method. This is done by generating QML code to override delegates with dummy Item instances with appropriate IDs and names. Task-number: QTBUG-65341 Change-Id: Ie6dca287cb74672004d9d8f599760b9d32c3a380 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Default: eliminate internal IDs in DelayButtonJ-P Nurmi2017-12-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ID in the internal Text element prevented deferred execution for the whole content item. The ID was used for two reasons. First of all, it was used to propagate implicit size from the Text element to the root of the content item. Secondly, it was used to calculate clip areas to provide the same text in two different colors. This patch provides two internal C++ helpers, ItemGroup and ClippedText, that provide these functionalities without the need of using IDs in QML. At the same time we got rid of two wrapper Items and simplified some QML bindings, which results to a nice boost (18->22) in qmlbench on TX1. Task-number: QTBUG-65341 Change-Id: Icf9c09356cf5c0ed641bde537bee7291bd260057 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 11:38:06 +0000