aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* tst_sanity|creationtime|objectcount: skip the internal indicator typesv5.7.0-beta1J-P Nurmi2016-04-123-9/+9
| | | | | Change-Id: I5c3d5309efeaab826e27ef97c3285803603e5e21 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickAbstractButton: fix the order of nextCheckState() vs. clicked()J-P Nurmi2016-04-122-32/+32
| | | | | | Task-number: QTBUG-52448 Change-Id: I4ee2c16f3dccc61e07268f9e8ced530a06d2adf3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7J-P Nurmi2016-04-112-1/+44
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-112-1/+44
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ScrollBar.qml src/imports/controls/material/ScrollBar.qml src/imports/controls/universal/ScrollBar.qml src/templates/qquickscrollbar.cpp tests/auto/controls/data/tst_scrollbar.qml Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9
| | * Fix ScrollBars with paddingsJoni Poikelin2016-04-011-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Padding was not taken into account when calculating the new position, which caused there to be small offset between the mouse press and the resulting handle position by the amount of padding used. Task-number: QTBUG-52233 Change-Id: Ibd8c4375b030a27a6124aefc4bc9af570d14d3a9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * ComboBox: fix usage in an asynchronous LoaderJ-P Nurmi2016-03-231-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Add RadioDelegateMitch Curtis2016-04-113-9/+172
|/ / | | | | | | | | | | | | | | | | | | | | RadioDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to RadioButton) to reflect what is most commonly seen on mobile. Change-Id: I143ee9a30cd8ce1d624354f4cb981c41dfddc2d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add CheckDelegateMitch Curtis2016-04-113-0/+151
| | | | | | | | | | | | | | | | | | | | | | | | CheckDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to CheckBox) to reflect what is most commonly seen on mobile. Change-Id: I6fdac226fe87247052389b2e49f6cf20d7be44fb Task-number: QTBUG-52208 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add Control::activeKeyFocusJ-P Nurmi2016-04-111-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a convenience property that combines Item::activeFocus and Control::focusReason. This allows us to solve QTBUG-51796 in an elegant way - we can simply set Qt::StrongFocus policy on most of the interactive controls, such as buttons. The only thing we need to make sure is to use activeKeyFocus instead of activeFocus in the styles. This ensures that key focus is only visualized when actually interacting with keys - not when interacting via touch or mouse. This is a generalized version of the solution that was already used in the Universal style ApplicationWindow. Change-Id: Ifbf78e3e412f3791c8f7c369bb2de53af9ac6b0f Task-number: QTBUG-51796 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update tst_dayofweekrow after qtbase's locale updateMitch Curtis2016-04-081-1/+1
| | | | | | | | | | Change-Id: I57cdc6c7b7bb91781b352931772a5aaa8196e0e2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Improve documentation for delegate controlsMitch Curtis2016-04-012-0/+99
| | | | | | | | | | | | | | | | | | | | - Add "Delegate Controls" doc page. This will list future delegate controls, such as CheckDelegate, RadioDelegate and SwitchDelegate. - Add GIF for ItemDelegate. Change-Id: If8c66ab2178185f96d190f29ef7815beaa6e8d68 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Revert "tst_swipedelegate: blacklist test_swipeVelocity on OSX"Mitch Curtis2016-03-312-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit faa65aebb2e52cc809248f6cbb86b994ff329285. It's not just OS X that fails, and tst_styles doesn't have a blacklist, so the test still causes integration failures for the material and universal styles. Rather than maintain two blacklist files, we'll just go back to skip(). Change-Id: Idcd460f5e90b205bc40367e48406b1b05b96d7fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Revert "tst_drawer: blacklist test_swipeVelocity on OSX"Mitch Curtis2016-03-312-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 68eec20b69851e5c0901a186ad27fe56abac1745. It's not just OS X that fails, and tst_styles doesn't have a blacklist, so the test still causes integration failures for the material and universal styles. Rather than maintain two blacklist files, we'll just go back to skip(). Change-Id: I3d7536aa86189a238346cb2e73a601a227b2b409 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Inherit QQuickDrawer from QQuickPopupJ-P Nurmi2016-03-231-2/+0
| | | | | | | | | | | | Change-Id: Icf71270e63aedd93ba975ab9743de68c3a54e849 Task-number: QTBUG-51007 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | tst_drawer: blacklist test_swipeVelocity on OSXJ-P Nurmi2016-03-232-2/+3
| | | | | | | | | | | | | | | | This way the tests are run at least on other platforms. Task-number: QTBUG-52003 Change-Id: Ibb5809aa56dc998d67e464d8d76cb51954d1581e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Support ApplicationWindow attached property for items inside PopupJ-P Nurmi2016-03-231-1/+7
| | | | | | | | | | | | Change-Id: Ie8fb9fcf415670102d9364f85120bc315a8a067e Task-number: QTBUG-51991 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Introduce ToolTipJ-P Nurmi2016-03-223-2/+174
| | | | | | | | | | | | Change-Id: I917f7e83219788fc63389773eb07ee39757bed7f Task-number: QTBUG-51003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | tst_swipedelegate: blacklist test_swipeVelocity on OSXJ-P Nurmi2016-03-222-2/+3
| | | | | | | | | | | | | | | | This way the tests are run at least on other platforms. Change-Id: Ibceb60e8069e74a93ee2e5de5c24711e01a91cba Task-number: QTBUG-52003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-221-0/+60
|\| | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp Change-Id: Idb43ff6aff692d01e9bc03450a474bf18a7e41fa
| * Popup: fix marginsJ-P Nurmi2016-03-211-0/+60
| | | | | | | | | | | | Change-Id: I09f974a00a5a2a8f14645ff5d9bfbd6bad03d324 Task-number: QTBUG-51990 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Drawer: respect swipe velocityMitch Curtis2016-03-221-0/+35
| | | | | | | | | | | | | | | | A fast enough swipe should open/close the drawer, even if it doesn't cross the position threshold. Change-Id: Iede4ec669f7d42d197e8a42623714c977b0c8a03 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix QQuickPopup::setVisible()J-P Nurmi2016-03-211-0/+10
| | | | | | | | | | | | | | | | | | | | Make sure to store the visibility flag even if the component is not yet completed. This way QQuickPopup::componentComplete() will run the enter transition as it was supposed. Change-Id: I1e4536e2fdb575b80174ae445626af43bdc45ed6 Task-number: QTBUG-51989 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Popup: make ApplicationWindow attached properties availableJ-P Nurmi2016-03-211-0/+12
| | | | | | | | | | | | Change-Id: Idde9fb49c222abc1ceabd15256695fd1961a9f76 Task-number: QTBUG-51991 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Change the default value of QQuickPopup::closePolicyJ-P Nurmi2016-03-211-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Popup::ClosePolicy was introduced, I thought that it would be better to not set OnPressOutside by default, because not all popups necessarily want to close on press outside. However, I've realized that every time I do Button { onClicked: popup.open() Popup { } } ...there's literally no interactive way to close the popup (popups don't take focus by default, so Esc doesn't work). Provided that a top-level QWidget with the Qt::Popup flag set also closes automatically on press outside, it probably makes more sense for us to follow the same pattern so that poor new users don't have to lookup the docs just to figure out how to make a popup close. :) In this case it's less troublesome to specify a different default value in those special scenarios/subclasses where closing on press outside is not desired (eg. the upcoming Popup-based Drawer). Change-Id: Iaeab4c548d63728df12232d8b65d469f0a2d80f5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: add increase(), decrease() and stepSizeJ-P Nurmi2016-03-211-0/+38
| | | | | | | | | | Change-Id: I052b650fee7ae94cc826446d285d653a41bd1e75 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | tst_popup: add missing window->requestActivate() callsJ-P Nurmi2016-03-211-0/+3
| | | | | | | | | | | | | | | | | | The tests are waiting for the window to become active, but not actually requesting it to be activated. Change-Id: I9f8cd6a09b0d89bba8f9adb9b5efa5bb59d7c185 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | tst_control: fix font testsJ-P Nurmi2016-03-211-20/+0
| | | | | | | | | | | | | | | | | | We cannot assume that TextField and TextArea have the same default font than Control. This is no longer true for the Material style, which sets specific fonts for the editor controls since 63ed622. Change-Id: Ida26160b690fa0b4784c30f9e3b5a6211e9d743c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add QQuickVelocityCalculatorMitch Curtis2016-03-211-0/+74
| | | | | | | | | | | | | | | | This can be used by classes like QQuickDrawer and QQuickSwipeDelegate to handle calculation of flick velocity. Change-Id: I783c5fccad8509a8ea0ad4559f3f8b0c47b7a9a2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Use fonts from theme for editable controlsNikita Krupenko2016-03-191-1/+13
| | | | | | | | | | | | | | Also set proper fonts for editable controls in Material theme. Change-Id: I78b8f8597a653af593787e569d6ba5ee7bf182a9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - config fileJ-P Nurmi2016-03-194-2/+2
| | | | | | | | | | Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - tst_gifsJ-P Nurmi2016-03-1912-11/+11
| | | | | | | | | | Change-Id: Ic7c4565d10f0a7074a063c73147a5b0b70352128 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | tst_Snippets: add missing "qtquick*.qml" filterJ-P Nurmi2016-03-181-1/+1
| | | | | | | | | | | | | | | | Most doc example snippet files were renamed in ca8f57f, the test needs to be updated accordingly. Change-Id: I633ace53b7aaf8853b6eae5c8c60a90c2ae38dc2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Cleanup QQuickProxyStyleJ-P Nurmi2016-03-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | Install and remove the proxy theme automatically to eliminate the need for TestTheme do it in tst_applicationwindow. Furthermore, fix some Qt coding conventions, align header guards, remove unneeded empty destructor, and add missing explicit keywords for one-parameter constructors and cleanup somemeaningless ones in paremeterless ctors. Change-Id: Ib95dad003e35e468e941f3a0d2be5b21323fcccd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add Popup::localeJ-P Nurmi2016-03-181-26/+62
| | | | | | | | | | | | Change-Id: I1f07318f3e018debd74e41bc0a1443c45def7bf3 Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add Popup::fontJ-P Nurmi2016-03-181-47/+98
| | | | | | | | | | | | Change-Id: I66feeb597e9f4a6176d6462640b3e26823a3d761 Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-1812-25/+25
| | | | | | | | | | | | | | | | | | 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>
* | tst_combobox: remove the extra ApplicationWindow instanceJ-P Nurmi2016-03-181-102/+46
| | | | | | | | | | | | | | | | These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-182-81/+215
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/controls/qquickstyleattached_p.h src/imports/controls/material/qquickmaterialstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickpopup.cpp Change-Id: I17c3c4d1040b89838f0903e0a17069b835895199
| * QQuickOverlay: fix background visibility for multiple modal popupsJ-P Nurmi2016-03-171-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | The idea of the "modalPopups > 1" check was to avoid calling QQmlProperty::write(), but it missed the fact that one modal popup might be still closing while a new modal popup is already opened. Thus, there's temporarily 2 modal popups visible, and we must transition the overlay background according to the state of the last shown modal popup. Change-Id: If25d83ccaa5adc29a9bc8d660f41fb66f90fb167 Task-number: QTBUG-51916 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Change locale inheritance for popupsJ-P Nurmi2016-03-171-77/+159
| | | | | | | | | | | | | | | | | | | | The last one in the series of making Popup inherit its properties from the parent window instead of the parent item. The same change was done for font and style already. Change-Id: I7024cce13f501e92024e9110e87ed33bbae6533d Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: corrected default, ToolButton and checkable controls fontsNikita Krupenko2016-03-161-4/+16
| | | | | | | | | | | | | | | | | | According to Android sources, ToolButton has the same font, as other buttons and checkable controls use default (system) font. Also, set proper size for default font. Change-Id: I355ab57ef476918bab346538fefbd6c0209d2221 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-1614-48/+404
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickcontrol_p.h src/templates/qquickpopup.cpp tests/auto/controls/data/tst_combobox.qml tests/auto/controls/data/tst_control.qml Change-Id: Ib7853d5ee5c4444872cd5c2d789e20d229c955d1
| * Store explicit and resolved font separatelyJ-P Nurmi2016-03-152-30/+90
| | | | | | | | | | | | | | Change-Id: I80bd45244077cd75f24c4ca1af6485f4c6a23b39 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Change style inheritance for popupsJ-P Nurmi2016-03-152-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to make popups inherit theme & accent from its parent item was driven by ComboBox. However, in many cases it has an undesired side effect, so we've changed Popup to inherit its style attributes from the parent window instead, just like we did for fonts. The only exception to this is ComboBox, where the popup is an integral part of the control. This special case is now handled in the respective style implementation. A concrete example is that we can now specify dark theme by default for Material style ToolBar to get a better matching light text against the colorful background. In Gallery, this won't effect the options menu, which is a child of a ToolButton. The menu retains light theme along the rest of the application. Change-Id: Ibdc8fcf5b5fa258d853410a9b40368472424a8c6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Test Universal fontsJ-P Nurmi2016-03-111-0/+21
| | | | | | | | | | | | | | Change-Id: I0daf4eb22d879e0b3e52ff16c9dd7b30a617001f Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Test Material fontsJ-P Nurmi2016-03-111-0/+41
| | | | | | | | | | | | | | Change-Id: Id80b0e851c82eecd6a8ae32f436b1a4bde0df40a Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Fix popup fontsJ-P Nurmi2016-03-112-48/+64
| | | | | | | | | | | | | | | | | | | | | | This is a partial revert of a405919. This change makes popups inherit the window font instead of the parent item font. Change-Id: Ie360e3831aadbd167859e17d381edf3a28945300 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Revert "QQuickControl: delayed the call of resolveFont()"J-P Nurmi2016-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3cba8b19c4e67cbcd6977bf141d7ddf2e54aae85. The change was done to implement font inheritance for popups, but it broke theme fonts for other controls. Since the former was a mistake (see comments in the linked bug report), it's best to revert back to what worked with theme fonts. Change-Id: I863765c5061b02607cfe04a848ff39e3243bd25f Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * tst_material/universal: use the appropriate styleJ-P Nurmi2016-03-116-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | The main purpose of these tests were to test the attached property and its inheritance, so it didn't matter which particular style was active while running the tests. However, it simply looks better if they run with the appropriate style, and this also allows us to add style-specific tests (such as font attributes). Change-Id: I827f26e469bce3445ffe7e24d6299bcfb587d849 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Fix font comparisonsJ-P Nurmi2016-03-114-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inheritance of explicitly set font attributes is involved, it is important to compare the resolve mask in addition to comparing the attribute values to avoid losing the information whether a specific attribute is set explicitly. For example, QFont::operator==() returns true for two fonts that are both bold regardless of whether only one of them has explicit weight set. Therefore, setFont() must not ignore fonts resolve mask. Furthermore, the fontChanged() notifier must be emitted only if the actual attribute values change, not if only the resolve mask changes. Change-Id: I2eb7a071c0eaecd2f8d2f6074c4ce6ed6764a6e9 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 23:01:26 +0000