aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Implement QQuickOverlay::touchEvent()v5.9.0-beta3J-P Nurmi2017-04-214-37/+94
| | | | | | Task-number: QTBUG-58389 Change-Id: I59b2936fd0c984c2dc7c1d3c49fb78c1fa950be7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-04-212-9/+19
| | | | | Change-Id: I106f1efad34b74af68dc59323aa6739212a78976 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix QQuickApplicationWindow::isComponentComplete()J-P Nurmi2017-04-212-1/+25
| | | | | | | | | | It has to default to true to ensure that a QQuickApplicationWindow instantiated in C++ is not stuck to false forever. When instantiated by the QML engine, it is set to false during the QML component initialization phase from classBegin() to componentComple(). Change-Id: Ieba2bbfb8fc0296b8cb28df91b12bcc55dd31bf4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix QQuickPopup::isComponentComplete()J-P Nurmi2017-04-213-2/+26
| | | | | | | | | | | | | | | It has to default to true to ensure that a QQuickPopup instantiated in C++ is not stuck to false forever. When instantiated by the QML engine, it is set to false during the QML component initialization phase from classBegin() to componentComple(). NOTE: QQuickPopupItem's visibility has to be now set outside of QQuickPopupItem constructor, because QQuickPopupItem::itemChange() calls back to QQuickPopup::itemChange(). At that point QQuickPopupPrivate::popupItem should be set. Change-Id: I96fa4ab4b2f29344c4a0d5bce5f8c7642e9db1a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickDrawer: allow passing a touch event to startDrag()J-P Nurmi2017-04-212-24/+53
| | | | | | Task-number: QTBUG-58389 Change-Id: I4fbdcc2ff4e45a4cbda3e4904c610ab1b269cba3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickDrawerPrivate::startDrag(): remove superfluous argumentJ-P Nurmi2017-04-213-3/+3
| | | | | | | | | | Popups used to have a valid window-pointer only when they were visible, but now the window is automatically looked up from the parent item. There is no need to pass the window pointer from the overlay anymore, because the drawer already knows the window. Change-Id: I9652607217a82af2be89f6ab4490431556e3d17c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickPopup: implement tryClose() for touch eventsJ-P Nurmi2017-04-213-8/+41
| | | | | | Task-number: QTBUG-58389 Change-Id: I40aef785cabda228f19c74a064187df509aa9916 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Prepare QQuickPopup for touch event handlingJ-P Nurmi2017-04-213-7/+111
| | | | | | | | | Add acceptTouch() and handlePress/Move/Release/Ungrab() to QQuickPopupPrivate, similarly to the recent changes to QQuickControl. Task-number: QTBUG-58389 Change-Id: I45bc0c51f7db79d0d3291f4beee6dab45b158e8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* *.pro: osx -> macosJ-P Nurmi2017-04-2014-14/+14
| | | | | Change-Id: I29b36eaa417986be24c917bc9c9b1f6441773e3d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add .qml files to OTHER_FILES to force them visible in Qt CreatorJ-P Nurmi2017-04-203-8/+12
| | | | | Change-Id: I50f26b1a0fd5d6bc79e125e46fe9a546a3441db3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_controls: remove waitForRendering() from test_multiTouchJ-P Nurmi2017-04-205-5/+0
| | | | | | | | | | Not sure why this was added in the first place. Now it has been copied to all test_multiTouch() implementations and sometimes slows down the test round quite a bit. Change-Id: I76e259e0267b34de6432998385b9f2e6759b9819 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Override QQuickControlPrivate::handleXxx()J-P Nurmi2017-04-2019-558/+147
| | | | | | Change-Id: I5c5be24142a758637e18df24b43847a8c6079346 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Re-enable tst_focus on LinuxJ-P Nurmi2017-04-201-4/+1
| | | | | | | | | | The auto test was disabled on Linux, because it was randomly crashing in libdbus on Ubuntu 14.04. The CI has upgraded to Ubuntu 16.04 so this should no longer be a problem. Task-number: QTBUG-50295 Change-Id: If654a30456a0d5e2a516b5e235b9b75e89425c92 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickSpinBoxPrivate::handleXxx(): remove unused return valuesJ-P Nurmi2017-04-201-13/+8
| | | | | | | | Match the signature of the upcoming QQuickControlPrivate::handleXxx() virtuals. Change-Id: Iad5f5d87e1abed37880e8682175214123b0df5c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickAbstractButton: align handleXxx() with QQuickControlJ-P Nurmi2017-04-202-19/+18
| | | | | | | | Match the signature of the upcoming QQuickControlPrivate::handleXxx() virtuals. Change-Id: Ieed3587443bea715b1b6eb2cc334130b2df7deb8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickControl: implement focus handling on touchJ-P Nurmi2017-04-2012-43/+172
| | | | | | | | | | | | | | | | | | | | QQuickControl::focusPolicy was only managed in mousePressEvent() and mouseReleaseEvent(). All controls call the base class implementations of these event handlers to get the focus policy handling "for free". Move focus policy handling to handlePress() and handleRelease() that can be re-used for touch events, and make sure that various controls call the base class implementation of touch event handlers. There's still a bit of duplication in QQuickControl::touchEvent() and the overridden handlers in sub-classes, but this will be improved step by step. QQuickControlPrivate::handlePress/Move/Release/Ungrab() are planned to be made virtual, overridden in subclasses, and only called from QQuickControl event handlers. Most mouse and touch event handlers in QQuickControl subclasses can be removed later when we get there. Task-number: QTBUG-58389 Change-Id: I7e82dc2ef49762a005c482ce1353e03cc841659f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* controls.pri: add $$PWD to QML filesJ-P Nurmi2017-04-201-52/+52
| | | | | | | Align with material.pri & universal.pri Change-Id: I52a63c141b681ccf72d6c1aaf14b1071aacb8106 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickPopup: add touch(Ungrab)Event()J-P Nurmi2017-04-204-0/+26
| | | | | | | | | This is required for now to keep things working when QQuickControl touchEvent() is added. Task-number: QTBUG-58389 Change-Id: I036cc39d96d4876056e01e619163dc1bbcffce74 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickComboBox: handle touch eventsJ-P Nurmi2017-04-193-0/+107
| | | | | | Task-number: QTBUG-58389 Change-Id: I7120d7bce827beb97a9ae3eaf4e99cf6b6e9f209 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Revise QQuickComboBox internalsJ-P Nurmi2017-04-191-7/+39
| | | | | | | | | Move the logic of press/move/release/cancel event handlers into methods in the private class, that can be reused for touch events. Task-number: QTBUG-58389 Change-Id: Ifc587f53975a8ddd5cd8baea52aff259de39876e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-184-3/+30
|\ | | | | | | Change-Id: Ia851f3ac828908ad693f393797e1e2c54bea5eef
| * Material: fix vertical paddings of the DialogButtonBox5.8Nikita Krupenko2017-03-111-2/+3
| | | | | | | | | | | | | | Height of a single-line button box should be 52. Change-Id: I9c65719dcf73f323996e9c687241259f8e6473fa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: use proper layout of the buttons in the DialogButtonBoxNikita Krupenko2017-03-103-1/+27
| | | | | | | | | | | | | | | | | | | | Instead of using system button layout, use layout from macOS, which better fits the Material Design guidelines and also used in the Android QPA plugin. Task-number: QTBUG-58060 Change-Id: I06381219b5f1ad0a32742487fd314a8017d82dfc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Cleanup unused qdoc markersJ-P Nurmi2017-04-185-12/+0
| | | | | | | | | | Change-Id: Ia42868a2e322aef2ae9a98049694f630b3458bcc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Universal/RadioDelegate: remove spurious control-propertyJ-P Nurmi2017-04-181-2/+0
| | | | | | | | | | | | | | Apparently slipped in by accident in b663020c. Change-Id: Ie0a292b6c230c4593c76165d2a78b946bb38351a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SystemTrayIcon: Fix documentation code snippetv5.9.0-beta2Friedemann Kleint2017-04-111-1/+1
| | | | | | | | | | | | | | MenuItem provides signal onTriggered(). Change-Id: Id61aee07d0463bc66a9e50d931a791fc4e0783c2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: update the type comparison tableJ-P Nurmi2017-04-111-3/+1
| | | | | | | | | | | | | | ComboBox::editable was added in Qt Quick Controls 2.2 in Qt 5.9. Change-Id: I5db1a6448a23d0e4f539f11c074270670b83899f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Cancel incubation recursivelyJ-P Nurmi2017-04-101-3/+15
| | | | | | | | | | | | | | | | | | | | | | It turns out that cancelling the incubation of eg. a combobox popup alone is not enough when its children might be incubating and would be left incorrectly guarded. Cancel recursively the whole object tree of a replaced/destroyed delegate to avoid that. Task-number: QTBUG-50992 Change-Id: Ia06931c4c7af3ed8bb56af6c29eb51081c4fccbb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | ScrollBar: react immediately when using a mouseJ-P Nurmi2017-04-102-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. [ChangeLog][Important Behavior Changes] ScrollBar now reacts immediately when using a mouse. Task-number: QTBUG-58667 Change-Id: I51759fc01dc8b8536834a8a3cca635ff512f7dc9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickScrollBar: handle touch eventsJ-P Nurmi2017-04-104-0/+256
| | | | | | | | | | Change-Id: I0521eb36ee01abc72edc869d92910e823f00a2f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Another attempt to fix tst_snippets on OS X 10.10J-P Nurmi2017-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is sharing (and showing, and resizing) the same view for every snippet. In the CI system we keep having issues that sometimes, after running the test for a while, the window content stops being resized as appropriate. Considering that QQuickWindow resizes its content item in resizeEvent(), this probably means that in the CI the window does sometimes not receive the resize event as appropriate. Before, the window was left hanging there after taking the very first screenshot. Now we try to close the window so that each and every screenshot snippet gets loaded while the window is hidden, shows it, and waits for it to become visible/active. This will hopefully ensure that the window will always receive an "initial" resize event. Task-number: QTBUG-58606 Change-Id: If4b38443cfdc9175f313bf8e70c7daf42d34f687 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Gallery: handle Menu shortcut on mobileJ-P Nurmi2017-04-061-0/+5
| | | | | | | | | | Change-Id: Ie7ad814b3999791801c60776777c6a736db1c093 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Gallery: handle Back shortcut on mobileJ-P Nurmi2017-04-061-2/+2
| | | | | | | | | | | | | | | | | | Menus, dialogs, and drawers already handle it out of the box, but for page/stack navigation we need an explicit shortcut. Change-Id: Iad3e05f0fc31dbd66e3b1aa9286f8ef076fcff0d Task-number: QTBUG-58105 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTabBar: add missing Q_REVISION() for contentWidth/HeightChanged()J-P Nurmi2017-04-061-2/+2
| | | | | | | | | | | | | | Missed in 24acfcaf. Change-Id: I11c87a21d7d29befec5784eff1961a6feb5ea24b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: highlight the Wearable Demo on the index pageJ-P Nurmi2017-04-061-0/+1
| | | | | | | | | | Change-Id: Ib7eb50df859ea598aac806dbd44f150f2b77e4e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | RangeSlider: react immediately when using a mouseJ-P Nurmi2017-04-052-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. Task-number: QTBUG-59920 Change-Id: Ida36eed1f59a30173e3a2c53b55e044a87c98d8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dial: react immediately when using a mouseJ-P Nurmi2017-04-052-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. Task-number: QTBUG-59920 Change-Id: I097cbdaed4933c0d907097b75f15ba16dcf615b1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Slider: react immediately when using a mouseJ-P Nurmi2017-04-052-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. Changing the behavior is simple, but auto tests need quite many tweaks so RangeSlider and Dial will be done separate follow up changes. [ChangeLog][Important Behavior Changes] Sliders and Dials now react immediately when using a mouse. Now the initial drag threshold applies only on touch, to avoid conflicting with flickables. Task-number: QTBUG-59920 Change-Id: Ifc1e6ed74c7894c3c854c975dff5238278827590 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | auto tests: utilize TestCase::fuzzyCompare()J-P Nurmi2017-04-052-28/+20
| | | | | | | | | | Change-Id: I9c3f7997a14bd1824663c7521061c4ee43d6380e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Set explicit cursors on all interactive controlsJ-P Nurmi2017-04-0518-5/+581
| | | | | | | | | | | | | | | | | | | | | | | | For example, if you have a floating button on top of a text editor, hovering the button must change the cursor from the editor's ibeam cursor to an arrow cursor. This applies to all interactive controls that call setAcceptedMouseButtons(). If a control blocks mouse events, it should not use some random cursor from another control underneath. Task-number: QTBUG-59629 Change-Id: I8a6ae306bbc76a9b22377361cb19cf9c3a872d31 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Rename tst_scrollbar to tst_cursorJ-P Nurmi2017-04-055-9/+10
| | | | | | | | | | | | | | | | | | | | | | This test was added in 88a62b3 that fixed the scrollbar cursor. It was not possible to test in QML, so a separate C++ test was added. It was noticed that most interactive controls have the exact same issue, so we want to utilize the same test for testing the cursors of all relevant controls. Change-Id: I7c307de9f72760b0993007246beb3357a1b5ec2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_combobox: use larger windowJ-P Nurmi2017-04-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | test_down() needs to place the popup below the combobox button to be able to test its pressed and down states while the popup is open. On some high DPI displays (Chromebook Pixel) the popup did not fit fully below, but got pushed partly over the button. Consequently, mouse presses went to the popup instead of the button and the test failed. Change-Id: I03e5768e00cf1eaf6d704a16ffe2b8d1705021b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | StackView: resolve relative URLs to the callerJ-P Nurmi2017-04-043-5/+24
| | | | | | | | | | | | Task-number: QTBUG-59309 Change-Id: I3c19d55431dd4831c4510acb5ef0e9fffa8f478f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickScrollBar: set implicit Cursor as Qt::ArrowCursorKarol Polak2017-04-045-0/+173
| | | | | | | | | | | | | | | | Scrollbar over TextArea had Qt::IBeamCursor, although the textarea would not be activated when clicked. Task-number: QTBUG-59629 Change-Id: Ie96ba03360fcfb5872f5bb6345e168c987978aca Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | BusyIndicator: add lacking initialization in material styleKarol Polak2017-04-041-1/+1
| | | | | | | | | | | | | | | | Random values of the m_elapsed could make the time in updateCurrentTime invalid. Task-number: QTBUG-59911 Change-Id: I8d36f50f01679f56300df9bae00a8d5de6528cc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | TextField: make textEdited() availableJ-P Nurmi2017-04-031-0/+1
| | | | | | | | | | | | | | The signal was added in Qt Quick 2.9 and has revision 9. Change-Id: Id1bb0f17ac5d8c9684ab5127782d030b54756e6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add missing Popup::aboutToShow() and aboutToHide() signalsJ-P Nurmi2017-04-031-2/+18
| | | | | | | | | | | | | | | | | | The signals have been there since the first release. The docs were just missing. Change-Id: I5f5340859136b8924832da4ddb2a18d4a812cca3 Task-numer: QTBUG-59400 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: replace "released" with "introduced" on the index pageJ-P Nurmi2017-04-031-1/+1
| | | | | | | | | | | | | | | | To use the same "was introduced in Qt 5.7" phrasing already used at the top of the page. Change-Id: I3736a1c3e87aa91e7fa3b8a41370f4b2252e793d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add style screenshots on the index pageJ-P Nurmi2017-04-031-0/+30
| | | | | | | | | | | | | | To make it more clear what the controls are and how they look. Change-Id: I6ce9a56a1692d90900952be798d7b254bc067dbb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: merge controls & styles columns in the version tableJ-P Nurmi2017-04-031-7/+3
| | | | | | | | | | | | | | | | | | | | The version table added in c9cd624 looked fine in locally generated docs, but it seems to get a bit too wide in the online snapshots (the table becomes horizontally scrollable). => Merge the controls and styles columns that all have the same version. Change-Id: Icb8387f95211ddee030cb410594adc9a6fad5c97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>