aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * ScrollIndicator: don't block touchJ-P Nurmi2017-07-041-0/+27
| | | | | | | | | | | | | | | | | | | | | | Unlike with mouse events there's setAcceptedMouseButtons(), currently there's no way to control whether a control receives touch events or not. As a temporary workaround until QQuickItem::setAcceptTouchEvents() has been added, we'll have to ignore touch events by hand. Task-number: QTBUG-61785 Change-Id: I9a678570bfdd104ae32b4040ecef7625dcfd1aee Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * BusyIndicator: don't block touchJ-P Nurmi2017-07-041-0/+27
| | | | | | | | | | | | | | | | | | | | | | Unlike with mouse events there's setAcceptedMouseButtons(), currently there's no way to control whether a control receives touch events or not. As a temporary workaround until QQuickItem::setAcceptTouchEvents() has been added, we'll have to ignore touch events by hand. Task-number: QTBUG-61785 Change-Id: I195d5ec3122ca0c7f2fade700b5b0c221472a243 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * PageIndicator: don't block touch when non-interactiveJ-P Nurmi2017-07-041-0/+36
| | | | | | | | | | | | | | | | | | | | | | Unlike with mouse events there's setAcceptedMouseButtons(), currently there's no way to control whether a control receives touch events or not. As a temporary workaround until QQuickItem::setAcceptTouchEvents() has been added, we'll have to ignore touch events by hand. Task-number: QTBUG-61785 Change-Id: I8e3bdc3df1c3b28afaf8f80965569135e6a53120 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * PageIndicator: fix touch supportJ-P Nurmi2017-07-041-4/+22
| | | | | | | | | | Change-Id: I00d4f6ed466e33be3f31b2cd0bcbae6707d84cb9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: add actionAt() and menuAt() accessorsJ-P Nurmi2017-07-101-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: reorganise layoutMitch Curtis2017-07-101-183/+184
| | | | | | | | | | | | | | | | Move more... exotic controls to the end, move relevant controls together and try to make better use of the space, like a puzzle! Change-Id: I0ad41caa3cbd0747351b552478b265ccc800d5ca Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add Drawer to testbenchMitch Curtis2017-07-101-0/+13
| | | | | | | | | | Change-Id: I4268a8ea1cd26fe3fe3f88460152ef15b0e28502 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix QTEST_QUICKCONTROLS_MAIN()J-P Nurmi2017-07-061-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | QTestResult::setCurrentTestObject(const char *name) does not make a copy of the char array. Make sure to keep the QByteArray instance alive in scope until QTest::qCleanup() has been executed to avoid printing random garbage in the footer: ********* Finished testing of ??????????? ********* Change-Id: I21e0165485b07070f4eec0f254a962fd3f06031f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QTEST_QUICKCONTROLS_MAIN()J-P Nurmi2017-07-052-2/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, repeat the auto tests with all available styles: $ ./tst_qquickmenubar ********* Start testing of tst_QQuickMenuBar ********* Config: Using QtTest library 5.10.0, Qt 5.10.0 (...) PASS : tst_QQuickMenuBar::Default::initTestCase() PASS : tst_QQuickMenuBar::Default::example() PASS : tst_QQuickMenuBar::Default::cleanupTestCase() [...] PASS : tst_QQuickMenuBar::Universal::initTestCase() PASS : tst_QQuickMenuBar::Universal::example() PASS : tst_QQuickMenuBar::Universal::cleanupTestCase() Totals: 12 passed, 0 failed, 0 skipped, 0 blacklisted, 2215ms ********* Finished testing of tst_QQuickMenuBar ********* When explicitly specified, run only with that one style: $ ./tst_qquickmenubar -style material ********* Start testing of tst_QQuickMenuBar ********* Config: Using QtTest library 5.10.0, Qt 5.10.0 (...) PASS : tst_QQuickMenuBar::Material::initTestCase() PASS : tst_QQuickMenuBar::Material::example() PASS : tst_QQuickMenuBar::Material::cleanupTestCase() Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 984ms ********* Finished testing of tst_QQuickMenuBar ********* Change-Id: Iad250eb373e6957fee259dc33f894b87413ded48 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Stabilize tst_menu::menuSeparator()J-P Nurmi2017-07-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | The same old story... QQuickWindowPrivate::flushFrameSynchronousEvents() keeps sending spurious hover events during auto tests. Send a manual leave event to the window to clear QQuickWindowPrivate::lastMousePosition so it won't send those hover events. Change-Id: I4d5548b2a5beff1a82f273f7e1e290e1cb88aadf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add DelayButton to testbenchMitch Curtis2017-06-301-6/+36
| | | | | | | | | | Change-Id: I92bd1f65e0ea2604139163c363458b7e551c4279 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | QQuickMenu: fix mnemonics for dynamic action/submenu itemsJ-P Nurmi2017-06-302-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously mnemonics worked only for "normal" menu items, but not for dynamically created menu items that present actions and sub-menus. This patch fixes the issue by specifying the menu as a QObject-parent for such dynamically created items, because QQuickShortcutContext is based on QObject-hierarchy. Change-Id: I3637ef06e9cb2a27673e4618c253279a0123b7c8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickAbstractButton: fix shortcut handling part 2J-P Nurmi2017-06-291-0/+14
| | | | | | | | | | | | | | | | Make sure to trigger the associated action if a button is activated via its shortcut. Change-Id: I73899a5540285c7c2b11a2481a9621ec6e83c6b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Yet another attempt to stabilize tst_menuJ-P Nurmi2017-06-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen a few tst_menu failures in the CI: FAIL! : tst_menu::menuSeparator() 'newMenuItem->hasActiveFocus()' returned FALSE. () Loc: [tst_menu.cpp(428)] Add moveMouseAway() calls (e81332e) to all remaining tests that test the current item or index, which can be affected by unexpected mouse hover events. Change-Id: I23b1743fcdcea5a4064fba2748426fd25274481e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Attempt to stabilize tst_applicationwindow::attachedProperties()J-P Nurmi2017-06-291-2/+3
| | | | | | | | | | | | Change-Id: I49539d41d78c2670bcbed1829800a5974f91675b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-295-16/+200
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickmenu.cpp Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
| * QQuickMenu: fix press-and-hold supportJ-P Nurmi2017-06-292-0/+95
| | | | | | | | | | | | | | | | | | | | Remove the OnReleaseOutside close policy, just use the defaults from QQuickPopup. This way menus won't get immediately closed on release, when opened from an onPressAndHold signal handler. Task-number: QTBUG-61608 Change-Id: Ifedd596aa0e71ac5f4211fa42e2ae499918df1b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix typos in tst_applicationWindow::attachedProperties()J-P Nurmi2017-06-291-3/+3
| | | | | | | | | | | | | | | | | | It is supposed to test the ApplicationWindow attached properties on Control, Item, and QtObject, but the Item instances were accidentally made Control instances. Change-Id: I6caf24b50fc0ffe97396364cf6b10b0ad653d9ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix tooltips to not block shortcutsMitch Curtis2017-06-281-1/+37
| | | | | | | | | | | | | | Task-number: QTBUG-60492 Change-Id: Ic1f380f44593d4a8681bff874789692d17b9edf7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix tst_calendar::MonthGrid::test_locale()J-P Nurmi2017-06-261-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | When the JS Date constructor is passed a string in the ISO 8601 format (e.g. "1970-01-01"), it is treatead as UTC, not local. Therefore, while comparing the expected dates from the model, we must base the comparison on UTC as well. Otherwise, the actual and expected dates may differ due to the timezone difference. This issue was detected thanks to a new CI setup that had accidentally UTC+8 timezone set. Task-number: QTBUG-61535 Change-Id: I93cfce5a81d48dc859f002dcd6b59ddb0701911c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickMonthGrid: fix touch supportJ-P Nurmi2017-06-261-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | QQuickMonthGrid lost its clicked() signal when multi-touch support was added to QQuickControl, because QQuickControl now accepts touch events and therefore QQuickMonthGrid no longer gets synthesized mouse events. Re-implement QQuickControlPrivate::handlePress/Move/Release/Ungrab() instead of QQuickControl::mouseXxxEvent() to gain multi-touch support. Task-number: QTBUG-61585 Change-Id: Ic6fb2ea0b43b2b44beb0d8fdd3335a20f7c028f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickAbstractButton: fix shortcut handlingJ-P Nurmi2017-06-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | QQuickAbstractButton::itemChange() already grabs and ungrabs the shortcut when the button's visibility changes, but setShortcut() was grabbing the shortcut without checking the button's visibility, so a hidden button ended up grabbing a shortcut. Furthermore, make sure to ungrab the shortcut on destruction to avoid leaving a dangling pointer to the application shortcut map. Change-Id: Ie93c2d073d7072abad271ba59a45428e3300cc28 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Overlay attached properties and signalsJ-P Nurmi2017-06-263-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ApplicationWindow] Deprecated the overlay grouped property in favor of the newly introduced Overlay attached properties. [ChangeLog][Controls][Overlay] Introduced Overlay attached properties and signals that supersede the overlay grouped property in Application Window. The Overlay attached type allows providing background dimming for popups without requiring an ApplicationWindow instance. Task-number: QTBUG-61336 Change-Id: I9df11bcb167e7725014d5f058fe24d70da4a10b3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make ApplicationWindow::activeFocusControl work with plain WindowJ-P Nurmi2017-06-261-2/+50
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ApplicationWindow] The attached activeFocusControl property has been made functional with a plain QML Window to make the functionality available when using QQuickWindow/View/Widget instead of ApplicationWindow. Task-number: QTBUG-61336 Change-Id: I46b91bca436d58c349c4f9ba8816245ab4ca33a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix palette inheritance for popupsJ-P Nurmi2017-06-237-0/+461
| | | | | | | | | | | | | | | | 9b20157 fixed font inheritence for popups in 5.9. This commit applies the same logic for palettes, and adds the same inheritance tests. Change-Id: Ib286ddcb9fc7ac4fb681d440c76d728dd07cb983 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: add more PageIndicatorsMitch Curtis2017-06-221-1/+13
| | | | | | | | | | Change-Id: Id1023b9d54560ffe3d5117b6bec109869ff381cc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-222-75/+68
|\| | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickspinbox.cpp tests/auto/controls/data/tst_scrollbar.qml Change-Id: Ief9481cb648076a951db0aeffaeb11aeaf392677
| * QQuickSpinBox: emit valueModified() on long pressJ-P Nurmi2017-06-161-75/+28
| | | | | | | | | | | | | | | | | | | | Move the emit inside QQuickSpinBoxPrivate::setValue() to avoid having to store and compare the old value in so many places where the value changes are interactive (mouse, keys, wheel). Task-number: QTBUG-61426 Change-Id: I7f42fc09cafc403eb55a9748e3a93c2e9bf6df62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * ScrollBar: fix flashing in Material & Universal stylesJ-P Nurmi2017-06-161-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure a suitable starting opacity for the inactive state transition. When calling increase() and decrease() from key-handlers, as the docs suggest, we flash the scrollbar by turning the active state on, and then back off immediately. If there is an opacity animation when the scrollbar becomes active (Material & Universal), the opacity animation is stopped right away, because the state changes back to inactive. This state changing trick worked only with the Default style, because it changes the opacity without animating when it becomes active. Change-Id: I4117de79c7145a710c0b6c43873ca2336b64e21e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Popup::enabledJ-P Nurmi2017-06-221-0/+21
| | | | | | | | | | | | | | [ChangeLog][Controls][Popup] Added "enabled" property. Change-Id: Icc1b2be2a0e73c392189efcd67167da4177cbe9e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Menu::currentIndexJ-P Nurmi2017-06-211-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Menu: allow horizontal flip for cascading sub-menusJ-P Nurmi2017-06-212-16/+25
| | | | | | | | | | | | | | | | Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-153-18/+147
|\| | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
| * ComboBox: fix QObject list value modelsJ-P Nurmi2017-06-121-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | When ComboBox::model is bound to a QObjectList property, the effective type of the model is QVariant(QQmlListReference) and things work as expected. When a similar QObjectList is constructed by hand in JS, or returned from an invokable method, the effective type of the model is QVariantList(QObjectStar) instead. In this scenario, we have to help QQuickComboBoxDelegateModel::stringValue() to lookup the property that matches the given textRole. Change-Id: Ib44c912cf647e1cd98c5608436427d31caf80d97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickMenu: fix key navigationJ-P Nurmi2017-06-091-3/+74
| | | | | | | | | | | | | | | | | | | | | | Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix QQuickContainerPrivate::itemSiblingOrderChanged()J-P Nurmi2017-06-081-0/+27
| | | | | | | | | | | | | | | | | | Repeaters are not part of the content model. Exclude them when calculating the target index when the order of items changes. Task-number: QTBUG-61310 Change-Id: Iaedd59288ed38e985a34ed8e1f515fdfb50d74e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickAbstractButton: add preliminary support for mnemonicsJ-P Nurmi2017-06-141-0/+34
| | | | | | | | | | | | | | | | | | | | This patch adds mnemonic shortcut functionality. We don't have a nice way to visualize mnemonics yet, so we just remove the ampersands from the UI for now. Change-Id: I90f54bd18d5d17f11e02c18c8461bfc25ce51cf1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickMenu::add/insert/remove/takeAction()J-P Nurmi2017-06-131-8/+39
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickMenu::add/insert/remove/takeMenu()J-P Nurmi2017-06-131-0/+53
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Menu] Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods for adding and removing sub-menus programmatically. Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: add a little delay for opening sub-menus on hoverJ-P Nurmi2017-06-131-2/+6
| | | | | | | | | | | | | | | | | | This improves the usability on desktop. When a menu has multiple sub- menu items, they don't all trigger a sub-menu (and close immediately) while moving mouse over the items. Change-Id: Ie4c9e409da8d6877e35506bffb94ed57f5985dcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add support for cascading sub-menusJ-P Nurmi2017-06-132-0/+437
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devJ-P Nurmi2017-06-1222-2/+1279
|\ \
| * | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-0822-2/+1279
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-index.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/quicktemplates2/qquickapplicationwindow.cpp src/quicktemplates2/qquickmenu.cpp src/quicktemplates2/qquickmenu_p.h src/quicktemplates2/qquickpopup.cpp tests/auto/auto.pro Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d
| | * Fix font inheritance for popupsJ-P Nurmi2017-06-0717-1/+1258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) First of all, Popup's QObject-parent depends on the way the Popup is declared in QML, or what is passed as a parent to createObject() when creating dynamic instances. For example: - Popup becomes a QObject child of of the contentItem: ApplicationWindow { Popup { } } - Popup becomes a QObject child of the window: ApplicationWindow { Item { Popup { } } } - Popup becomes a QObject child of the specified parent: ApplicationWindow { Component { id: component Popup { } } Component.onComplete: component.createObject(overlay) } Since QQuickWindow and QQuickView did not set the QObject-parent of their contentItem and rootObject, respectively, we had troubles finding popup instances, because window->findChildren<QQuickPopup>() and window->contentItem()->findChildren<QQuickPopup>() would produce inconsistent results. This has been fixed in qtdeclarative commit af6655885, so now we can use window->findChildren() reliably. 2) Popups inherit font from the associated window, not the parent item. It was wrong to call resolveFont() in setParentItem(), because the parent item might not change even though the associated window does. The piece of code was moved to setWindow() instead. 3) QQuickPopupItemPrivate::resolveFont() did not propagate the default font at all when the font was resolved before being associated to a window. 4) After the above fixes had been applied, to ensure that popups always inherit fonts and propagate them down to children as appropriate, we got a new test failure in tst_controls::Popup::test_font() indicating that there were extra font change notifiers triggered at creation time. This was fixed by associating "top-level" popups with the window as soon as they are appended to ApplicationWindow's default property, instead of waiting until the popup is complete and then doing a lookup in the parent hierarchy. Task-number: QTBUG-61114 Change-Id: I6185c76d50835cb7a06b03db0a3ac9ddad64bdd3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix QQuickStyle::availableStyles()J-P Nurmi2017-06-075-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out macOS debug symbol (.dSYM) directories from the list of available styles. Task-number: QTBUG-60973 Change-Id: I5b9c3f4af946d44b1601f32bf7da699c29a86689 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Stabilize tst_menuJ-P Nurmi2017-06-123-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QQuickVisualTestUtil::moveMouseAway() (adapted from qtdeclarative) to help with testing menus that are now highlighting items on hover. It is important to move the mouse cursor away outside the window in such tests where hover highlight might conflict with the test. Change-Id: If3d642dd4f3ba2936a0d22c078d8fb0125d16c6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix warnings in the buttons manual testJ-P Nurmi2017-06-081-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | QQuickIconLabel::font doesn't have a notifier signal: QQmlExpression: Expression qrc:/ButtonLoader.qml:95:29 depends on non-NOTIFYable properties: QQuickIconLabel::font => Use QQuickControl::font instead. Change-Id: I63eec0a5f258971bc44a7866fee018e261eb4d6e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: update the highlighted item on mouse hoverJ-P Nurmi2017-06-071-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the expected behavior on desktop. NOTE: It must be possible to mix mouse hover highlighting, and keyboard navigation in the way that keyboard navigation must seamlessly continue from the item that was previously mouse highlighted. Furthermore, there should be only one item highlighted at a time. In order to be able to respect keyboard navigation while another item is hovered and vice versa, the visual highlight should be bound to MenuItem::highlighted instead of Control::activeFocus or Control::hovered. [ChangeLog][Controls][MenuItem] Menu has been fixed to highlight its items while key navigating and mouse hovering to ensure seamless item highlight between mouse hover and key navigation. In order to provide appropriate highlighting that works for key navigation and mouse hover, styles should bind their visual highlight to MenuItem::highlighted instead of Control::activeFocus or Control::hovered. Change-Id: I70cad5a5b441f2616d1ce2166e97974dc1ae063f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu::popup(): set the current indexJ-P Nurmi2017-06-071-0/+6
| | | | | | | | | | | | | | | | If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-066-10/+375
|\| | | | | | | | | | | | | | | | | | | | | | | | | Fusion style ComboBox popup height was adjusted according to 90a0d402 to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass with the Fusion style. Conflicts: src/imports/controls/ComboBox.qml src/imports/controls/material/ComboBox.qml src/imports/controls/universal/ComboBox.qml Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 23:17:20 +0000