aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix font inheritanceJ-P Nurmi2017-09-112-0/+123
| | | | | | | | | | In item views, it can happen during incubation that a control doesn't yet have a window associated when the parent item changes. Therefore we must make sure to resolve the font when the window changes. Task-number: QTBUG-63119 Change-Id: I890f70ae6faa232dcc2c094ccec02e76b371d2cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix non-modal drawer drag/swipe open and closeMichal Policht2017-09-061-0/+83
| | | | | | | | | | Function QQuickPopupPrivate::blockInput() has been overridden in QQuickDrawerPrivate to accept events that occur while mouse/touch is grabbed and events within drag area. Task-number: QTBUG-59652 Change-Id: Icf4129e702a351b266ea9c4544830185c315fc37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickSpinBox: fix initial value validationJ-P Nurmi2017-08-291-0/+6
| | | | | | Task-number: QTBUG-62508 Change-Id: I8981968c02b65d4b005eb9b54b0228fd51a3abda Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix a crash with ScrollView + TextAreaJ-P Nurmi2017-08-291-0/+16
| | | | | | | | | TextArea was not cleaning up its geometry change listener on the Flickable it was attached to. Task-number: QTBUG-62292 Change-Id: I31223d4fcf0b46235b18e8eb05bab686a32f5481 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* StackView: Resolve relative urls in initialItemAlessandro Portale2017-08-071-0/+6
| | | | | | | Check whether a URL is relative and try to resolve that. Change-Id: I6b0f7bca2011356aca5071d20dbd270eb5d115bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Popups: take Window::contentOrientation into accountJ-P Nurmi2017-07-272-0/+108
| | | | | | Task-number: QTBUG-62158 Change-Id: I0bcf5b02da6a3500e4324462d5f1249a6178c9fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix QQuickStackViewPrivate::viewItemTransitionFinished()J-P Nurmi2017-07-261-0/+13
| | | | | | | | | | | ~QQuickStackElement() emits QQuickStackViewAttached::removed(), which may be used to modify the stack. Set the status first and make a copy of the destroyable stack elements to exclude any modifications that may happen during the loop. Task-number: QTBUG-62153 Change-Id: I144acd693519e637b78f9a2d910e83da8f2d779e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickDrawer: fix multi-touch leaking through modal overlayJ-P Nurmi2017-07-142-0/+197
| | | | | | | | | | The first touch point was blocked as appropriate, but the consequent touch points were leaking through to other popups below Drawers' modal overlay. Task-number: QTBUG-61581 Change-Id: I1c3e28e3d25b7489c4a9b684107fd1b5158e1674 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix focus handling for popupsJ-P Nurmi2017-07-112-4/+55
| | | | | | | | | | | | When a popup is closed, if there are multiple popups open, restore focus to the next popup in chain instead of transferring focus to the window content. This allows us to cleanup the custom focus handling for sub-menus in dev. There is no more need to manually transfer focus to the parent menu or to a sub-menu, but calling open() or close() is enough and the focus is automatically transferred as expected. Change-Id: I54406c7c6b8dd25af261e00ebb1ae00ccbea8b9f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Drawer: ignore and warn about invalid edge valuesMitch Curtis2017-07-071-0/+10
| | | | | | | | | This fixes an issue where an application would crash when opening a drawer by dragging it after an invalid edge value had been set. Task-number: QTBUG-61843 Change-Id: Ie9b9ea0276b356b92927b858f2be355bfc042afb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Tumbler: fix regression with currentIndex and currentItemMitch Curtis2017-07-072-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | 2c4b2d48 made Tumbler's wrap property follow its count by default, but did so using updatePolish() to account for the use case where a items are appended to the model in a for loop, as is done in TumblerDatePicker.qml in Tumbler's auto tests. This (appending items one at a time in a for loop) is not a good idea, but it should work. The problem with the solution is that the delay means that the use cases mentioned in the referenced bug report were broken. This patch removes the delay. The recursion guards are necessary due to the complex nature of TumblerView (and its non-standard use of the Qt Quick views), as they prevent a memory leak in QQuickListView::createHighlight() from being introuduced. We now call deleteLater() to ensure we do not interfere with the views' internal operations, and hence we also perform a few extra operations at the same time as insurance (although it appears that simply unparenting the internal view from QQuickTumblerView is enough to get the tests to pass). Task-number: QTBUG-61374 Change-Id: Ifef9e99522ea183b282ac862f346beaed12d0c09 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix modal overlay to block multi-touchJ-P Nurmi2017-07-041-0/+34
| | | | | | Task-number: QTBUG-61698 Change-Id: I46db5e9816190ac7afd6b671198dff11089bc4f3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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: 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>
* 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>
* 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>
* 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>
* Attempt to fix tst_controls::ComboBox flakinessJ-P Nurmi2017-06-061-0/+8
| | | | | | | | | | | QQuickWindowPrivate::flushFrameSynchronousEvents() is a real trouble maker in auto tests, because it keeps delivering spurious hover events based on the last mouse position from earlier test functions and test cases. Task-number: QTBUG-61225 Change-Id: I5a8d40a01e3919033f74b26357505f2b514a3281 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* ComboBox: fix empty popup being shown after model is clearedMitch Curtis2017-05-311-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, ComboBox's popup is sized vertically in this way: implicitHeight: contentItem.implicitHeight Adding an item to a ComboBox with an empty model and then opening the popup results in the implicitHeight being used in the line below (in QQuickPopupPositioner::reposition()): QRectF rect(p->allowHorizontalMove ? p->x : popupItem->x(), p->allowVerticalMove ? p->y : popupItem->y(), !p->hasWidth && iw > 0 ? iw : w, !p->hasHeight && ih > 0 ? ih : h); An explicit height was never set on the popup, and ih (the implicitHeight of the popupItem) is greater than 0. This is fine. However, when a ComboBox's popup item grows large enough that it has to be resized to fit within the window, its explicit height is set. The problem occurs when the model is then cleared, as the implicit height of the popup item becomes 0. So, while "!p->hasHeight" is still true, "ih > 0" is not, and the explicit height of the popup item is used, which is still the previous "let's fill the entire height of the window" size. To fix this, we bind the height of the popup to a different expression: height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin) This ensures that the popup has a zero height when the ListView's implicitHeight is zero (i.e the model is empty), and a height that fits within the window in all other cases. Ideally, we'd have a maximumHeight property that controls this, but for 5.9, we have to fix it this way. Task-number: QTBUG-60684 Change-Id: Ied94c79bb7b0e693be34e9c7282d991f6f704770 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Page: fix initial layouting of dynamically created instancesJ-P Nurmi2017-05-311-0/+37
| | | | | | Task-number: QTBUG-61109 Change-Id: I43d28a80ec1a46e836fa8a0f76ee65b0c1a24228 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-314-10/+307
|\ | | | | | | Change-Id: Iba044084bf82f6b2b8ceba4aa2a80bdcf8fc38e0
| * Fix drawers not to be touch-draggable through modal popup shadowsJ-P Nurmi2017-05-082-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Material style popups have a shadow outside the popup. QQuickOverlay cannot block press events to children of a popup, because otherwise interacting with popup contents would be impossible. However, since the shadow is outside of the popup, touch events don't propagate to the popup and get naturally blocked by the popup background. Instead, the touch event propagates to the overlay. At this point, we must do an additional check whether we're allowed to start dragging a drawer. Task-number: QTBUG-60602 Change-Id: I9b5c81246bca7ea40bce0e46dc2e94558a0b9204 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Drawer: fix dragging from the inside over interactive contentsJ-P Nurmi2017-05-083-10/+161
| | | | | | | | | | | | Task-number: QTBUG-60598 Change-Id: I65e6e9440c9450fbec4a53b9ee60e11b919c090a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_popup: add closeOnEscapeWithNestedPopups()Mitch Curtis2017-05-262-0/+180
| | | | | | | | | | | | | | | | | | | | This test confirms that the behavior found in the gallery example (where there are several nested popups that should close when the Escape key is pressed, and a Shortcut that should also be activated by the Escape key once all popups are closed) continues to work. Change-Id: Ie848ff3505e66ded7b78777808d982c642092d61 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_tooltip: fix test_attached() failing when it's not run firstMitch Curtis2017-05-261-1/+5
| | | | | | | | | | | | | | | | | | It currently depends on being the first test that uses attached properties to be run. This patch resets the values to the expected values at the beginning of the test to avoid the failure. Change-Id: I9dea7867e6740cba2e3541bffd1f6648ddf0e47d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Make tst_pageindicator::test_interactive() more reliableJ-P Nurmi2017-05-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | PageIndicator uses Row internally, and changing its spacing triggers an asynchronous relayout. Instead of waiting for the Row to relayout, just pass the padding and spacing at construction time to ensure that the Row has suitable layout for testing mouse clicks between the row items. Change-Id: I9c25c6b57042abb0363bdfe73ebac047cff0fcc7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_combobox: make test_highlightRange() more reliableJ-P Nurmi2017-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | This test is failing with the upcoming Fusion style, perhaps because the combo delegates are a bit heavier. Give the Popup and ListView some time to layout themselves, before attempting to find a list item at the bottom. Change-Id: Ib8486bb7dbc4a43eb3549e2e7ca7ad1be5bad4a0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickStackView::clear(): don't emit depthChanged() when already emptyJ-P Nurmi2017-05-221-0/+12
| | | | | | | | | | Change-Id: Ib20995b86e776cb64a3d1fa6dea01dee4a802426 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ApplicationWindow: fix access to revisioned members in base classesJ-P Nurmi2017-05-181-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The inheritance hierarcy is: QWindow <- QQuickWindow <- QQuickWindowQmlImpl <- QQuickAppWindow Each base class has its own set of revisioned members. Import the revisioned members in the base classes to the templates/controls namespace by calling qmlRegisterRevision() with the revision of the base class and the respective templates/controls version. Task-number: QTBUG-60893 Change-Id: I6d91209dc5b2eb17c2b3845675a5ddbffb7e8b72 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_objectcount: use setBenchmarkResult() instead of printLiang Qi2017-05-161-13/+6
| | | | | | | | | | Change-Id: Ieb435b6ac929da753cfff0b157d18d4218cb50d9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_objectcount: data-driven qobjects vs. qquickitemsJ-P Nurmi2017-05-161-50/+29
| | | | | | | | | | Change-Id: Ia1f9f0fe9d0d907b16159e964573ba1273cc75b9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | tst_snippets: inject the style name to image file namesJ-P Nurmi2017-05-121-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, qtquickcontrols2-label.qml outputs: - qtquickcontrols2-label.png (Default) - qtquickcontrols2-material-label.png (Material) - qtquickcontrols2-universal-label.png (Universal) This allows us to take screenshots with different styles without overlapping names and error-prone manual renaming. Change-Id: Ic475ee0d95539a1122e37780f8cec038e2fc9446 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_controls: use TestCase::createTemporaryObject()J-P Nurmi2017-05-094-16/+6
| | | | | | | | | | Change-Id: Iec2e4fdba18402762c6d6580abf8e677d5ae583c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-081-0/+6
|/ | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: I2b8d7612ae22741cb19037ff47698f096753d9ca Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* tst_snippets: skip style-specific screenshots when appropriatev5.9.0-beta4J-P Nurmi2017-05-042-1/+10
| | | | | | | | For example, don't take screenshots of qtquickcontrols2-material-*.qml snippets when running with another style than the Material style. Change-Id: Ifef5b841d16314ba5d131a7d56f57251d6780ae7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Cleanup obsolete references to doc/snippets/screenshotsJ-P Nurmi2017-05-041-1/+1
| | | | | Change-Id: Ia631cd493d695aaac44d612f234756b4e5b558dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_snippets: take screenshots only when requestedJ-P Nurmi2017-05-031-61/+43
| | | | | | | | | | | | The component loading code has been adjusted so that it can load snippets that use either a Window root element too. This speeds up the test a lot in the CI, and allows us to flatten the snippet-structure. Set SCREENSHOTS=1 environment variable to take screenshots. Change-Id: Ibd9e76befe62044dd1374899f18ea3d8c7ad454b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Drawer: fix drag-over-threshold calculationJ-P Nurmi2017-05-022-20/+45
| | | | | | | | | | Don't steal a horizontal drag if a flickable has been dragged a long distance vertically, and then later the flick happens to exceed the horizontal drag threshold. Change-Id: Idf39997aa20cc41da561f182119199f30c63ba32 Task-number: QTBUG-60521 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_popup: disable touch compressionJ-P Nurmi2017-05-021-0/+7
| | | | | | | | 09b9a55 added touch event tests to tst_popup::overlay(). In order to make touch tests reliable, touch event compression must be disabled. Change-Id: I9fcda132447d9a8cf6ef80163be46aea391eff24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>