aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Allow creation of custom QQuickPopupItem-derived typesMitch Curtis2021-05-188-100/+196
| | | | | | | | | | | | | | | | | | | | | | This allows QQuickPopup-derived types to have their own QQuickPopup-derived popup item. This is useful for controlling e.g. implicit content item sizing. Task-number: QTBUG-83630 Change-Id: I279d2e39df9a9cff29b3015a2f5baae7128f461f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6b8a9673111bbf888990ce5904e176057ad4a71b)
| * Imagine: fix GroupBox's bottom edge being clippedMitch Curtis2021-05-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | Use the actual padding from the nine patch image rather than the hard-coded 12. Fixes: QTBUG-91924 Change-Id: I4707ae173c088625657a135680619cf646e3a9e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 9a10ab40b7bc3db21f48ff004c5c5525cbfd40de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QQuickDial: Keep value integer if everything is integerFabian Kosmale2021-05-042-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user uses integer values for stepSize, from and to in a Dial, they most likely want the actual values of the Dial to be integers, too. Detect this condition, and store it in a new boolean member. If the condition is met, we round the value in QQuickDialPrivate::valueAt (which, due to floating point math might not be an exact integer). As a drive-by, reorder the boolean members to introduce no additional space overhead. Fixes: QTBUG-92214 Change-Id: If4633fae1d7d425ca7fb767c7284d6f8ea7ce78c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 42687caf7bc7496b838995f3fa68194ca8323da3)
| * ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-04-263-1/+35
| | | | | | | | | | | | | | | | | | | | | | Check if a Flickable type was actually set as the contentItem before accessing the pointer. Also warn that using a type other than Flickable is not supported. Fixes: QTBUG-93039 Change-Id: I1470766c6de02b7b601edf1375791d3147f26ab5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e7df2279bf5519703fd0b853abaa23947a599920)
| * Change the name of the material style plugin to avoid a path limitAndy Shaw2021-04-232-2/+2
| | | | | | | | | | | | | | | | | | | | On Android 5, the path length limit is low enough that it causes the material style plugin to be too long. So we adjust the name of the plugin to enable it to be loaded without a problem. Change-Id: Id8713d93164ea57cccfff037b074f2e17b351a34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| * QmlDesigner: Fix RangeSliderSpecifics snap modeHenning Gruendl2021-04-211-1/+1
| | | | | | | | | | | | | | | | Task-number: QDS-4212 Change-Id: I82d524960a34e9307ddf9b154a326d8fadc7387c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f42abbcb7794bcfc884e8aee75f73bd9ab8fbda4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-075-10/+45
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia55f51bc5a14b1b9f55e1ae4123f52d779e24e94
| * Ensure the ninepatch image is detachedLaszlo Agocs2021-04-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | Applied the change to the file at different location in 5.15 as the automatic merge fails. Fixes: QTBUG-88162 Change-Id: Id83d04fce668a3e05d150c086abdecc9d59e51e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 837b3795c237d20dfca4be46e10697e1cd300e60) Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Ninepatch: keep resetNode status to not lose track of ↵Laszlo Agocs2021-04-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | ImageNode->NinePatchNode changes Fixes: QTBUG-87236 Change-Id: Ie8371de8a9d49054c888e4bffb7e89392a6d7c07 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 764b21987e36bc0734b7e8c9aab0e0d25771b56e) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Fix static buildJoni Poikelin2021-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Function with the same name is exported from QtQuick which leads to multiple definition linker error. Marking this function as static avoids the issue. Change-Id: I29f3923ee55b5181e9b76b91e49d9f753f54ed8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 02b18562fe1d6dec50e361a2ac568cb11087b743) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I3e5de18601b2e5bc52124999f6a4df10f402af95
| * ComboBox: don't focus TextField when clicking on indicatorBartlomiej Moskal2021-02-182-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit fdece5a40729d7c370d920ddfcad2921183dbbec) Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-22650-13578/+13578
|/ | | | | | | | | | | This reverts commit 950f8bff7cbbdbd472234fd32ef659c9d0e8ba7c. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I69e514934864bea3ccd68de9a65fb08e262325a1 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Combobox: Fix initial set of inputMethodHintsBartlomiej Moskal2021-02-032-6/+16
| | | | | | | | | | | | | | | Fix for setting up initial inputMethodHints to Qt::ImhNoPredictiveText for Combobox. Before this change, Qt::ImhNoPredictiveText was never set for Combobox. As inputMethodHints() by default returns Qt::ImhNoPredictiveText value, setInputMethodHints didn't allow to set this value correctly. Task-number: QTBUG-61021 Change-Id: Ie4ec0d32fff7586bc3a8bd055b752000c0330fad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit b87cada5e386e5a16ff04cf50bd88e97c4819099)
* Fix popups with exit transitions blocking mouse events when destroyedMitch Curtis2021-02-023-4/+163
| | | | | | | | | | | | | | | | | | | | | | If a popup had an exit transition set and was destroyed upon e.g. being rejected, it would not destroy its modal dimmer, and so events would not go through to popups that were beneath it even after it was destroyed. QQuickPopup's destructor does indirectly attempt to call finalizeExitTransition() through a setParentItem(nullptr) call, but prepareExitTransition() returns false if it sees that the exit transition is already running, and so transitionExit() never calls finished(). This patch fixes the problem by explicitly calling finalizeExitTransition() in QQuickPopup's destructor if the exit transition is running. Fixes: QTBUG-89673 Change-Id: I468fae52f6a83ac314877c67d062028634bb7e17 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 51d416cdfd909aacd5047632a7cc1661a158731a)
* a11y: Fix ordering on header, content item and footer in PageJan Arve Sæther2021-02-0210-1/+283
| | | | | | | | | | | | | | | Because of the previous behavior, the footer could be read aloud by the screen reader before the content item. And even worse, the footer could be read aloud even before the header in some cases. This made it hard for visually impaired people to use the application. The Page type was used by the Dialog type, so it also affected that. Fixes: QTBUG-75042 Change-Id: Ic3e8ec3f7dcf18af9262b1d35c986835c8da6900 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4b1acb290dc8869d0d2d1250dc1ed415d6b6e202)
* Update commercial license headersTarja Sundqvist2021-01-22650-13578/+13578
| | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtquickcontrols2. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4209 Change-Id: I4175d7a58cb1b04172132a3bc09aea1b065d1778 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix initial currentIndex in Tumbler when wrap is set to falseAlexey Edelev2021-01-142-2/+24
| | | | | | | | | | | | | | | syncCurrentIndex () function assumes that PathView is used as view for, Tumbler component, and states that actualViewIndex should be 0 while initialization. This statement is not correct when Tumbler is in non-wrap mode and uses ListView as view, where currentIndex is set to -1 by default. Fix actualViewIndex condition according to ListView logic. Fixes: QTBUG-84426 Change-Id: I4ef1e7b45399bf748968490f44b8909f3218d9bc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 1fe83c1fd3eb9abfd13a7b8c7adb2c2355d8ad4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SwipeDelegate: ensure background and contentItem are resizedMitch Curtis2021-01-144-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the geometry of a control changes, this code is called: void QQuickControl::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickControl); QQuickItem::geometryChange(newGeometry, oldGeometry); d->resizeBackground(); d->resizeContent(); if (!qFuzzyCompare(newGeometry.width(), oldGeometry.width())) emit availableWidthChanged(); if (!qFuzzyCompare(newGeometry.height(), oldGeometry.height())) emit availableHeightChanged(); } SwipeDelegate works by moving the background and contentItem together when it is swiped to expose the various delegates. Because this involves setting the position of the background, the check for background's x position being 0 in QQuickControlPrivate::resizeBackground() would fail and the background would not be resized at all. Fix this by making resizeBackground() virtual and don't check the x when checking if we should set the width. Similarly, in QQuickSwipeDelegatePrivate::resizeContent(), we should set the contentItem's width instead of just repositioning and resizing it vertically. Fixes: QTBUG-85770 Change-Id: I36684bf2797719db87fe93063cc7685efe594eea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 83f49d3f4c0041bf2c74ff1ff2eb03c5d37aa1f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Reset the opacity and scale properties after the exit transitionAndy Shaw2021-01-064-4/+76
| | | | | | | | | | | | | | | | By resetting the opacity and scale properties after an exit transition we are ensuring that it does not lose the original values that the user may have set. [ChangeLog][Important Behavior Changes][Popup] After the exit transition is finished, then the opacity and scale properties will be reset to their values before the enter transition is started. Fixes: QTBUG-87283 Change-Id: I2b192c96eaea2906d968341255e80cd19be177e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit df33c79fb6579f94498164531777320e79c36fd5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlDesigner: Remove duplicate of repeatThomas Hartmann2020-11-102-13/+3
| | | | | | | | | | | The autoRepeat property is already part of AbstractButton. I renamed "Repeat" to "Auto Repeat" Change-Id: I4f22ebc18a2094e67c8f48263f84ab9eb7d497b6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit abb8f124e11ab056be6dc0221d7fdae485febd04) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: remove all instances of \qmlpropertygroupMitch Curtis2020-11-0910-12/+0
| | | | | | | | | This is apparently no longer necessary. Change-Id: I0f45a84ced5118d248ffab4e745c4e2f2ce5738f Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 08477f64d8b1a7161ad884551c84cffab0e7d5be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix Qt Labs Platform Menu icon documentationMitch Curtis2020-11-091-4/+4
| | | | | | | | | It was probably copy-pasted from MenuItem. Change-Id: I20f7e107252346f52bf8c061fe18e1ca6a0bf150 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 7174714f77fd803bb7b79dea3dda046acc7d1dee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QQuickHeaderView models to pass model testerVolker Hilsheimer2020-11-062-5/+14
| | | | | | | | | | | | | | | | | | Following 72e0d699cec09458ca9325035d477d4899e8e47b in qtbase, the model tester exercises additional code paths to verify correct row/columnCount implementations for flat models. This revealed a few bugs in the models used in QQuickHeaderView and the unit test: * neither QHeaderDataProxyModel nor the test models handled a valid parent index for calls to row/columnCount * QHeaderDataProxyModel::sibling passed the index on as parent Change-Id: I612e18030d837275614d61ce8987c93fff7f20a9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit bdc14837191dc81452fa7fbba20ba0a29e5fbebd) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: fix SplitView's inheritanceMitch Curtis2020-11-051-1/+1
| | | | | | | | | | It inherits Container. Fixes: QTBUG-88184 Change-Id: Ic4878c2b240dad2294569a48c4f39e82d377133a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c357974b4e1a3400d8036039c15dddac3b863046) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | - 6822a725cffd20a21475c57d7195465c59f5903b tst_qquickpopup: fix setOverlayParentToNull test - 2abdd399bf359e2459e4ae7c6456736087aa1c32 Add changes file for Qt 5.15.1 + 1740afc07950fb0ae3aca0aad2534191805ff672 Material: fix binding loops when binding between attached properties + 454ca2f441ae3d400255471a7ebe850c6779ad0e Update the text when the inputted value is out of range + 50f3c1b5551228d932f302a06580c70a3a77c336 Unregister the accessible observer before deleting the private object + 59aaf903cc54a7cfba00ec3859ca59292f4cbf4a Allow the preparation of the exit transition even if it did have focus + 1e8d3ffa5fb95699d18af5639ffeb90054b71856 Don't trigger a close due to a release if we did not get a press + f2c5b91201bd3df8de9f47fe71a9d0f2f5b76882 Bump version + 68a916d8ec4ff964bb1310b4065494e9e041499e QQuickMenu: fix contentModel memory leak + 43c9cc30a26f7fb482248115eec418128a1add0f QQuickMenu: fix heap-use-after-free + b6280dd207746f32092f5cb2b55b8c5f8ffa44b9 Add setAcceptTouchEvents() in controls that handle touch events + 88bdce23e260cce2d3a163997d9032c3e6fac858 Specify the QtQuick dependency of templates also in qmldir + 51a57c7ea852151235b692475f08915edb16bb90 Only add a shortcut if the sequence is not empty + c9e58c2168450fd3b1fe3aca3dd143d5fd0db8c5 ScrollView: document how you can make ScrollView scroll in only one direction + a1b0f708e6a22297bdd8af2cf8c461de5da7a16e Add changes file for Qt 5.12.10 + 1a3d27b017fae0471a82870b28e1e808bc2aac33 QQuickAbstractButton: don't accept key release if we're not pressed + a0899012f44806957d0254c8e76cca97adb624f6 Remove qtxmlpatterns from requirements Change-Id: Ic01c73f9d43154a59a41589d4eea185d072cc9f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 16f27dfa3588c2bf377568ce00bf534af48c9558) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I00ff69d1b2b36efd64ba21d8cf89b2caad71ff33
* Remove qtxmlpatterns from requirementsAssam Boudjelthia2020-10-221-1/+1
| | | | | | | Change-Id: I29b52ed46485f5078458a93ca8c7b20d781ee873 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit a83143078c96b421e684e508d02c6d3f024cc505) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickAbstractButton: don't accept key release if we're not pressedMitch Curtis2020-10-223-1/+125
| | | | | | | | | | | | | | A control should have been pressed if it's going to accept a release. This prevents an issue where a menu opened by pressing enter (handled via attached Keys property) would instantly trigger the first menu item. Fixes: QTBUG-83698 Change-Id: I6b1afbb76f37623012472b2b1148b4862c159239 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit a5e1c787f6512013a092f7708c6928b5a9e263c2) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-191-0/+27
| | | | | | | Change-Id: I2bed937e04ac3f3b955b222572acd462d1e75ff1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 63f73a2aee40f9bec5ef63fdd416877a6737110d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ScrollView: document how you can make ScrollView scroll in only one directionRichard Moe Gustavsen2020-10-151-1/+7
| | | | | | | | | | | | It's not obvious how you can make a ScrollView resize the content size in such a way that you're only allowed to scroll in one direction (taking any scroll bars or padding into account). So add a line the explains how you can do it. Change-Id: I2d4594d99eab2390d7a5f24710a7e381dbac4c2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 64f8ab1e2c1c995bb1b4b295861e477f7cfd4e0e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Only add a shortcut if the sequence is not emptyAndy Shaw2020-10-081-2/+6
| | | | | | | | | | If the sequence is empty then reset m_shortcutId to -1 so it does not have a shortcut attached to it. Change-Id: I16945950145d9d3ca7da73e998b28d64997501d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 746358e855613de5401f5be867365188a19e4800) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Specify the QtQuick dependency of templates also in qmldirUlf Hermann2020-10-061-0/+1
| | | | | | | | | | It is already specified in plugins.qmltypes, but we want to get rid of those dependency specifications. Task-number: QTBUG-87164 Change-Id: I4f21e624eb00ab8d9401260e0dce523bb97e296c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add setAcceptTouchEvents() in controls that handle touch eventsShawn Rutledge2020-10-028-0/+32
| | | | | | | | | | | | | | | This could have been done since Qt 5.10. In Qt 6 it becomes mandatory; so perhaps we will add a qWarning in case an Item handles touch events without declaring that it wants to handle them, to encourage users to do that. This patch will then prevent that warning when using Controls. See qtdeclarative/1457df74f4c1d770e1e820de8cd082be1bd2489e and then qtdeclarative/ab91e7fa02a562d80fd0747f28a60e00c3b45a01 Cherry-picked from dev branch 0ef66bfa 811c6193 and 3c2eab82. Change-Id: I5f9318bd1cad0f760caf02b9066e729af3601098 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickMenu: fix heap-use-after-freeMitch Curtis2020-09-292-0/+11
| | | | | | | | | | | | | | | | The previous patch fixed a memory leak, which in turn exposed an issue caused by item change listeners not being removed before contentModel is destroyed. QQuickMenuPrivate::itemParentChanged() then tried to access that contentModel, resulting in a heap-use-after-free. This patch fixes the issue by removing all menu items before the menu is destroyed, ensuring that the change listeners are removed in time. Task-number: QTBUG-86851 Change-Id: I3dc0a251d7fd9c05c384de6472e73493b2d5b664 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 5e4f4ed2410a29914a70b7c7d0b7b4f3a136f289) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickMenu: fix contentModel memory leakMitch Curtis2020-09-292-1/+8
| | | | | | | | | | | | Q_Q should not be used in a QObjectPrivate-derivative's constructor, as q will be null at that stage. Instead, add QQuickMenuPrivate::init() and create the contentModel there. Fixes: QTBUG-86851 Change-Id: Ia2a955e718cc0486af5a05e24fcfcb1c4bacb48d Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit f12e2061c460504d6db1d1370e97b5eeead9c7bf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I941d54ca7ff882f8ce0edfd32cf6a7aeff60c8b4
* Don't trigger a close due to a release if we did not get a pressAndy Shaw2020-09-181-0/+2
| | | | | | | | | | | | If the drawer does not see the press point then it was not open at the time it was pressed. This ensures that when a touch is done on a button to trigger the opening of a drawer it does not think it should be closed due to the default close policy. Change-Id: I0d1b11341e659dc14554d0d72aac70199bbb99fa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d3cc8710bc6175e5e7562ba171bd32dfc4d224b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Allow the preparation of the exit transition even if it did have focusAndy Shaw2020-09-152-2/+21
| | | | | | | | | | | | | | This amends 1a5a0a591c35dcf498a232a802087683f2244ecb so that it only sets the hadActiveFocusBeforeExitTransition variable if it is false, ensuring that it is correctly handled later on if it is true from before. This handles a case of closing, opening and then closing again in one function call. Task-number: QTBUG-85884 Change-Id: Ied4ca33045b005f5f666e63d85fb603e9350d982 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b0b11a6d4ae8a03998a5c84b91d9cb0b75387059) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Unregister the accessible observer before deleting the private objectAndy Shaw2020-09-151-3/+3
| | | | | | | | | | | | By unregistering it in the destructor of the control and not the private object ensures that it does not react to any accessibility changes. This prevents any problems arising due to changes coming when the private object is deleted. Change-Id: Icce0cc0cff54ce35ddf6be74e32bb0bdeff6d0fc Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 60d798f2a445552165fae3e622129f5356f61a0b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update the text when the inputted value is out of rangeAndy Shaw2020-09-112-13/+49
| | | | | | | | | | | | | | | | | | | | When the inputted value is out of range but it would be fixed to the previous value then it would not update the text correctly to show the corrected value. This ensures that it is updated as appropriate. Before it would check if the value had actually changed after it had been fixed to the corrected value. So if it was corrected to the original value then it would not see it as having changed. Additionally the displayText also has the original text before the change, so we have to force through an update to ensure the contentItem's text is updated too. Change-Id: Ic38787d0803ab59cd998f4e2871c613f1642e764 Fixes: QTBUG-85719 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 97d2d271233246ed8a0d8930c9110603bf7b03bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Material: fix binding loops when binding between attached propertiesMitch Curtis2020-09-035-63/+229
| | | | | | | | | | | | | | | | | | | | | | | | | The paletteChanged signal was used as the change signal for a lot of properties. The problem with this was this binding, for example: Material.foreground: Material.toolTextColor results in foreground being set, which emits paletteChanged. toolTextColor has paletteChanged as its change signal, so that is triggered and then the foreground binding is re-evaluated in the middle of already being evaluated. I haven't found a way to fix this for toolTextColor yet, so we temporarily skip emission of toolTextColorChanged when foreground changes. This means that some text will be the wrong color when foreground is changed after startup. For other properties, using more specific change handlers is enough to solve any binding loops. Task-number: QTBUG-85699 Change-Id: Ied52d4c38914765ed5c75e234954f4baabaaa9af Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 7f29e89c26ae2babc358b1c4e6f965af6ec759f4)
* Add changes file for Qt 5.15.1Antti Kokko2020-08-311-0/+49
| | | | | | | Change-Id: I25293c4357635590278bb018ffb71422b75192a1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit c0daab494a58ff881afc0252872359e5291a1478) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qquickpopup: fix setOverlayParentToNull testMitch Curtis2020-08-261-0/+2
| | | | | | | | | Use the fix from 1d06eb3f8215b67c5061ee3a076df405724ff7ee. Fixes: QTBUG-86212 Change-Id: I407c56741806340235da81cca943b50cc6e92dd2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4d76bce10d8f71dd3dc79e30ff947afe866c5041)
* QQuickSpinBox: fix another "function expressions as statements" warningMitch Curtis2020-08-202-1/+13
| | | | | | | | | | | This amends d5fbbddd7794265f24d392d33c4874ac756cb9c9 by also fixing valueFromText(). Task-number: QTBUG-64151 Change-Id: I02b053bb4d4579e86eaaa2279826f3b103800fdf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2d0794cbc73a6913bea075804f232c4996d5fc4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document that pop() does nothing if depth is less than or equal to 1Mitch Curtis2020-08-201-0/+3
| | | | | | | | | | | This note is already in the detailed description, but users looking at pop() can easily miss that. Task-number: QTBUG-85903 Change-Id: I92c71c8d98b2a83aefbc99229e5b16a6fb33b937 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 70686007ce8c5f237e3319525682bbb85c99c49e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SwipeDelegate: don't allow calling close() when pressedMitch Curtis2020-08-192-0/+51
| | | | | | | | | | | This conflicts with the behavior of SwipeDelegate. The released() or clicked() signals should be used instead. Fixes: QTBUG-85804 Change-Id: I06111b63941f54c06f0e1b828d17264f37d765d5 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 6f41c69c9bc5a0ce59444e40d3a55018f7994743) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SwipeDelegate: don't emit closed() when already closedMitch Curtis2020-08-192-2/+25
| | | | | | | | | | | If the mouse is released while our position is 0, it means we were clicked, and we don't need to begin any transitions to close. Fixes: QTBUG-85806 Change-Id: Ic521f48e2977c1a99dbecaa585792a7798b9d749 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit f3a64b13725081eb94b05dbeb5f68a2298c9163e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Prevent against re-entering prepareExitTransition after a focus changeAndy Shaw2020-08-192-1/+37
| | | | | | | | | | | | | | | | | | When a popup is hidden, then it will trigger a prepareExitTransition which can cause the active focus to be lost. If the popup's visibility is tied to that fact then it can retrigger the transition which means the active focus does not go back to where it should. Therefore, we check if hadActiveFocusBeforeExitTransition is false before going through that process as then it will only be called the first time the popup is hidden. Fixes: QTBUG-85884 Change-Id: I68054aeb48447617b4235ce6467514a17f1073ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 1a5a0a591c35dcf498a232a802087683f2244ecb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility file for 5.15 for QtQuickControls2Milla Pohjanheimo2020-08-171-0/+11690
| | | | | | | Binary compatibility file added. Change-Id: I5cee4e537d40285c92c61963134656b3559abde5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 00:14:50 +0000