aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-24384-1239/+3417
| | | | | | | | | | | | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ApplicationWindow: fix typoJ-P Nurmi2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was meant to be called contentData, as the getter is called, but the part in the Q_PROPERTY macro that specifies the name of the property contained "data" in place of "contentData". [ChangeLog][Controls][ApplicationWindow] The data-property has been renamed to contentData, as it was documented. Notice that a data-property still exists in QML Window, but is no longer overshadowed in ApplicationWindow. Task-number: QTBUG-58932 Change-Id: I5251d42f5ae5ef6d04d87c3f8d20d7adbefe1eb5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: remove color animation on various controls' backgroundMitch Curtis2017-02-244-25/+0
| | | | | | | | | | | | | | | | | | This resulted in the background becoming very dark when toggling between enabled/disabled or editable/read-only states. Task-number: QTBUG-58828 Change-Id: I710fa97aefd26e490a219ba99833d5bfe47f2133 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | QQuickStackView: fix pop/replace exit leakJ-P Nurmi2017-02-244-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickStackView did not keep track of the element that was exiting the view during a pop/replace exit transition, but it was expecting viewItemTransitionFinished() to be called and cleaned up the element there. If a pop/replace exit transition was running at the destruction time, QQuickStackView did not clean up the element at all (because it had been already removed from the internal stack of elements) and thus the transition was left running. Task-number: QTBUG-59034 Change-Id: I3cd7c761fab79574b9a7cc849788f36765def45b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Prevent StackView filtering of UngrabMouse eventMichael Dippold2017-02-232-0/+22
| | | | | | | | | | | | | | | | | | | | | | Currently the StackView is filtering the UngrabMouse event during transitions. If a MouseArea is still in the pressed state during this time it will forever be in the pressed state as the ungrab event is filtered. Task-number: QTBUG-59098 Change-Id: I7effdad6a36b64336b4770a1dca61ba47998b787 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Attempt to stabilize StackView::test_statusMitch Curtis2017-02-211-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-59034 Change-Id: I736bd57ba18b3a8d8c4550e89aba462e559597a6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | QQuickPopup: ensure that the cursor is correct when overlapping itemsMitch Curtis2017-02-203-0/+97
| | | | | | | | | | | | | | | | | | | | When a popup is over an item that has a different cursor (such as a TextField), the cursor incorrectly took on that shape, because QQuickPopup didn’t have an explicitly set cursor. Task-number: QTBUG-58810 Change-Id: I4df6dd725cac027b2c30fe69ad81d9cd7e622c15 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Platform: respect the configurable features in Qt Widgetsv5.9.0-alpha1J-P Nurmi2017-02-102-19/+88
| | | | | | | | | | | | Change-Id: I4a0696e4f897a378e3944c7948ba00e5f2038f5d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Cancel incubation of replaced/destroyed delegatesJ-P Nurmi2017-02-1016-96/+23
| | | | | | | | | | | | | | | | Resolves the "Object destroyed during incubation" issues. Task-number: QTBUG-50992 Change-Id: Ie58c958dafbf915da7494dac25351be98106c6ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Provide more context for the configurable feature descriptionsJ-P Nurmi2017-02-082-3/+3
| | | | | | | | | | Change-Id: I962d8150583cc1637cbb8d6fb7399b8f408b186e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Fix -no-feature-shortcut buildJ-P Nurmi2017-02-074-4/+12
| | | | | | | | | | Change-Id: If567b99889b40528150834c3319cdfec8e5b229e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Respect the "Quick Designer support" featureJ-P Nurmi2017-02-071-1/+1
| | | | | | | | | | Change-Id: Ibebff13b92d2ad9335de872f0b70ae3f43051061 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make styles configurable featuresJ-P Nurmi2017-02-067-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure [...] Qt Quick Controls 2: Styles ................................. Default Material Universal Supports both syntaxes: -(no-)style-[material|universal] -(no-)feature-quickcontrols2-[material|universal] Change-Id: I011cc38e5752d2c718376ca7493940271920b3e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add "hover support" configure featureJ-P Nurmi2017-02-0617-6/+160
| | | | | | | | | | | | | | | | | | | | ./configure -no-feature-quicktemplates2-hover [...] Qt Quick Templates 2: Hover support .......................... no Change-Id: I0509a1a9ac3ffe2cbfe4f2016ce0345708860b84 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: move Control::contentItem snippet to match backgroundMitch Curtis2017-02-031-9/+9
| | | | | | | | | | Change-Id: I46ff0f20bbdde131d4206a970ce60c76d491f24b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add missing information to "Attached properties" sectionMitch Curtis2017-02-021-15/+61
| | | | | | | | | | | | | | | | | | A lot of details were left out, which makes it hard to follow along. Task-number: QTBUG-56013 Change-Id: Ia21dd43e0d6e260463a2a91b28c248b962dd3401 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Tumbler requires ListView and PathViewJ-P Nurmi2017-02-024-7/+31
| | | | | | | | | | Change-Id: Ieb40f536cc5d68fdf13075df2c9b3e09d5077de3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge dev into 5.9Oswald Buddenhagen2017-02-0131-35/+1489
|\ \ | | | | | | | | | Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
| * | Make TextArea work out of the box inside ScrollViewJ-P Nurmi2017-01-273-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][TextArea] TextArea has been made to work inside ScrollView, providing necessary scroll bars out of the box. Change-Id: I212ee4c60912c961cbb9683540848141dcba29a5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Add ScrollViewJ-P Nurmi2017-01-2723-11/+1423
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | QQuickScrollBarAttached: fix change listener removalJ-P Nurmi2017-01-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before bb2a6c6 QQuickScrollBarAttached called flickable->updateOrAddGeometryChangeListener(Size) when attaching to a Flickable, and flickable->removeItemChangeListener(Geometry) when detaching from a Flickable. In bb2a6c6 the latter was changed to flickable->updateOrRemoveGeometryChangeListener(listener, Size) to make the attach and detach operations nice and symmetric. Now the problem is that updateOrRemoveGeometryChangeListener(Size) doesn't actually remove the listener, but just resets the geometry types it listens to. Thus, upon destruction of QQuickScrollBarAttached, it leaves behind a dangling pointer in Flickable's list of change listeners. We can call either of these to fix the problem: flickable->updateOrRemoveGeometryChangeListener(Nothing) flickable->removeItemChangeListener(Geometry) The former does essentially the latter with some extra overhead, so we'll just revert back to how it was before bb2a6c6. I added a warning note, also to ScrollIndicator since it's using the same approach, to avoid the same pitfall in the future. Change-Id: Ibdce15b22edf549491426d769b74b18daf0500ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Keep track whether ScrollBar::interactive is explicitly setJ-P Nurmi2017-01-263-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upcoming ScrollView toggles between interactive and non-interactive scroll bars depending on whether it is interacted via touch or a mouse device. This allows ScrollView to check whether the user or style explicitly requested a specific mode and respect it. Change-Id: I69d21652b3a91cb9db0f76ba52adc35ccd612ab1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-2/+16
| |\| | | | | | | | | | Change-Id: I83cbec9264a8bc620badf210eee53b57f2b93ff0
| | * QQuickPopup: allow QQuickWindow as a parentJ-P Nurmi2017-01-242-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Previously it would unintuitively complain that "cannot find any window to open popup in" if a window was passed as a parent. Change-Id: I984d4c941afae12733a9c1c2f0441da867298aa1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix build with -no-feature-settingsJ-P Nurmi2017-01-313-0/+6
| | | | | | | | | | | | | | | Change-Id: I204c50539288df16c4d4010e91c8ecc60f202ec6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Fix build with -no-feature-wheeleventJ-P Nurmi2017-01-3116-0/+32
| | | | | | | | | | | | | | | Change-Id: I6f40794ae1977d1f23916bff6d0c58d44440fbe5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Doc: correct PageIndicator descriptionMitch Curtis2017-01-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The BusyIndicator and PageIndicator sections got mixed up in f043b64c3. Task-number: QTBUG-58343 Change-Id: I08d8d7319660923aa4333739882ae376bf368abb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Default QQuickRangeSlider::live to trueJ-P Nurmi2017-01-272-21/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] On a popular demand, RangeSlider has been changed to report live value updates. This can be disabled by setting RangeSlider::live to false. Change-Id: I18dee0df6f7a97d11a1994e779e70ac5f08b6dbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default QQuickDial::live to trueJ-P Nurmi2017-01-272-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] On a popular demand, Dial has been changed to report live value updates. This can be disabled by setting Dial::live to false. Change-Id: Ie591ec33f56482b825250f64abf55118afec3e6b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Default QQuickSlider::live to trueJ-P Nurmi2017-01-273-74/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] On a popular demand, Slider has been changed to report live value updates. This can be disabled by setting Slider::live to false. Change-Id: I48c6a92eb794d2846cfff96d8784c53c22843573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update QQuickText revision (9)J-P Nurmi2017-01-271-0/+4
|/ / | | | | | | | | | | | | QQuickText::forceLayout() was added in Qt 5.9 / Qt Quick 2.9. Change-Id: I6ea6438f9948ccad4fa3060238882db408b7be10 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickSpinBox: handle touch eventsJ-P Nurmi2017-01-242-37/+73
| | | | | | | | | | | | | | | | This makes it possible to interact with multiple spin boxes at the same time. Change-Id: I7161a05303384711c30651b495851d7e953e9e3f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Use keepTouchGrab instead of keepMouseGrab when handling touch eventsJ-P Nurmi2017-01-243-14/+17
| | | | | | | | | | Change-Id: I7ea3db90fbafea68c094d1525ee28972823960ac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickSwitchDelegate: handle touch eventsJ-P Nurmi2017-01-243-24/+247
| | | | | | | | | | | | | | | | This makes it possible to interact with multiple switch delegates at the same time. Change-Id: I40d1f31d2e361665b2e09b3bb071832f3efcd75b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickSwitch: handle touch eventsJ-P Nurmi2017-01-243-24/+247
| | | | | | | | | | | | | | | | This makes it possible to interact with multiple switches at the same time. Change-Id: I1a8c2ff6ddb7e867b3d9d66f15c49ae5b70231e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickAbstractButton: handle touch eventsJ-P Nurmi2017-01-247-1/+350
| | | | | | | | | | | | | | | | This makes it possible to interact with multiple buttons at the same time. Change-Id: Ice17efcb8b6dc5337455cd38ee88c39dfef2baae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_stackview: use TestCase's new createTemporaryObject functionsMitch Curtis2017-01-241-73/+27
| | | | | | | | | | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: I2e29bdcb7099875b3b746f930e94107c46e0a2e5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_combobox: use TestCase's new createTemporaryObject functionsMitch Curtis2017-01-241-94/+32
| | | | | | | | | | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_tooltip: use TestCase's new createTemporaryObject functionsMitch Curtis2017-01-241-19/+7
| | | | | | | | | | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ic64c1cfa95229bf733e81f1a382e1961c4ab53d6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Update plugins.qmltypesJ-P Nurmi2017-01-242-86/+309
| | | | | | | | | | Change-Id: Ic16c8e0796178bd99fc7dd8c965c0ed1de8da9d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update QtQuick.Templates import versions in the docsJ-P Nurmi2017-01-241-2/+2
| | | | | | | | | | Change-Id: I5ad6841a507c2488618ec3bf694249fb3b8b4d1c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update dependencies.jsonJ-P Nurmi2017-01-242-3/+3
| | | | | | | | | | Change-Id: I5da3186533ae018da655e58078de18377d5113d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update IMPORT_VERSION in the .pro filesJ-P Nurmi2017-01-244-4/+4
| | | | | | | | | | Change-Id: I9546ee274e5376151e9f5faffda87182f2e10188 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickScrollBarAttachedPrivate::setFlickable()J-P Nurmi2017-01-232-48/+114
| | | | | | | | | | | | | | | | | | | | QQuickScrollBarAttached was assuming that a QQuickFlickable instance was passed to the constructor. This patch allows specifying it after the construction, making it possible for the upcoming ScrollView to use attached scrollbars. Change-Id: I7c434734f74df65af86263f09da6a46fa68fc946 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-234-0/+51
|\| | | | | | | Change-Id: I70bce420ae7d82d1bd72ff3d6c4f034525272aba
| * Fix resizing of implicitly created content itemsJ-P Nurmi2017-01-232-0/+13
| | | | | | | | | | | | | | | | | | Pane, Frame, and other container type of controls create their default content item lazily (commit 0e3636a). Under certain circumstances, the default content item was not resized as appropriate. Change-Id: Ia1f55030f62cc7b02c5bc770b4983f1240acf42d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickAbstractButton: don't leak space key eventsJ-P Nurmi2017-01-232-0/+38
| | | | | | | | | | | | | | | | Unlike mouse events, key events are not accepted by default. Key events must be accepted to avoid event propagation. Change-Id: I8d9217e6f18d56515470bef2507d462edd274ce2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickScrollBar: fix overshootJ-P Nurmi2017-01-202-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | ScrollBar should not always force a range of 0.0-1.0, but only when interacted with. This way, the scrollbar stops at bounds when dragged, but flicking the attached Flickable respects its boundsBehavior and overshoots if appropriate. The logic and test is adapted from QQuickScrollIndicator commit 8d093a. Change-Id: Ida720d4cc2bb1de06ba0c02dfb25be51dd3108fc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ScrollBar::policyJ-P Nurmi2017-01-208-7/+129
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollBar] Added a policy-property, which holds whether the scroll bar is shown always/never/as needed (default). Change-Id: Ibe25edaef04a7926bc12c59913efa7a3d43a5ccf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Move QQuickScrollBar(Attached)Private to a private headerJ-P Nurmi2017-01-204-75/+144
| | | | | | | | | | | | | | To make the private classes accessible for the upcoming ScrollView. Change-Id: Iae1d7f9b136a99ac5892418c52071a902e665476 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 14:04:31 +0000