aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-105-7/+26
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I80bcbfe5faec3d7a2cc0770a99723f13779cf3ce
| * RangeSlider: update handle positions when 'from' or 'to' value is changedIvan Solovev2021-12-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The RangeSlider's setTo() and setFrom() implementation was not updating the positions of the handles. This patch fixes it and aligns the behavior with the basic Slider. This commit is cherry-picked from qtdeclarative repo of the dev branch, because QuickControls2 were merged into that repo in Qt 6. Fixes: QTBUG-98482 Change-Id: I482c416f91be2b97af1d922305dfe6fc1f5bd573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 7ff266ff782b35817d3ecc1a08c3a54bd2c2aa88)
| * Fix build without accessibilityJoni Poikelin2021-11-121-1/+3
| | | | | | | | | | Change-Id: I26e27edcb64a7b99996e0867862dded9c888bbe8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Register the overlay with QQuickApplicationWindowVolker Hilsheimer2021-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | QQuickApplicationWindow creates its own overlay. We must register it as a dynamic property so that the virtual keyboard can find it. In Qt 6, this is not needed. Task-number: QTBUG-97075 Change-Id: I31d832939eeaeb69e3842b3e67f19b59414d903b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Consider all popups in the stack to test whether an event should be blockedVolker Hilsheimer2021-10-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since modal and modeless popups can be arbitrarily nested, it's not enough to just let the first popup in the stack handle an input event to see if it should be blocked. The first popup might be modeless and have a modal parent that then should block events to items further down. So, return true for the first popup that handled the event, otherwise continue down the stack. Fixes: QTBUG-86854 Change-Id: I04fe7833b86353f40cb047cd1330751233dc98c3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 85be957e9f936ea2d0fd9d7ceaf5da8eb1bcac49) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Give focus to popup on prepareEnter instead of finalizeEnterTomi Korpipaa2021-10-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If focus is given on finalize, then popups that have enter transitions may end up stealing focus from popups that were opened later. Note: Qt 6.x needs a separate task, as qtquickcontrols2 is inside qtdeclarative. Otherwise the commits are identical. Dev version can be found here: https://codereview.qt-project.org/c/qt/qtdeclarative/+/376858 Fixes: QTBUG-85918 Change-Id: If58b4278edeea8673e56c25d899cd4e3c4765edc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix activeFocus for highest-z popupTomi Korpipaa2021-10-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | If there was no popup with active focus, giving focus to the highest-z popup failed on exiting the previous one. This is identical to the dev version, only in a different module: https://codereview.qt-project.org/c/qt/qtdeclarative/+/376653 Fixes: QTBUG-85956 Change-Id: I6f328abfd2d6379297b97940420789aa80293977 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-122-0/+8
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iefcdbd5f75acac4a2c7049c49f1a1c50bbe2151d
| * Fix memory leak in Qt Quick Controls iconEirik Aavitsland2021-09-072-0/+8
| | | | | | | | | | | | | | | | | | | | | | The implementation of the icon property uses the internal QThemeIconInfo struct from qtbase. That is low level and expects the user to handle memory deallocation, and this was missing. Change-Id: Ied6488aa8871c246d3781a3db47f40130dc19bcc Fixes: QTBUG-93050 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e13ba851847f23de49a6e7cf7d87f67bc74cedbc)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-1612-203/+138
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I85122ded86860165f2d9523e3ac15e129df1fa75
| * Revert "ToolTip: use contentWidth of Text contentItem to account for newlines"Mitch Curtis2021-08-165-213/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a063cd0be5e8f108a0084831856f4af8c0e9159c. It causes QTBUG-94764. Task-number: QTBUG-83630 Task-number: QTBUG-94764 Change-Id: Ib27d827e25d4e4cea805d0f8e3c32b8aa843ec6a (adapted from from commit 009a0262bc0436d4822a3438fc99e02ed15dfc69) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Revert "Allow creation of custom QQuickPopupItem-derived types"Mitch Curtis2021-08-168-196/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6b8a9673111bbf888990ce5904e176057ad4a71b. The follow-up commit a063cd0be5e8f108a0084831856f4af8c0e9159c causes QTBUG-94764, so we don't need this enabling change for now. Task-number: QTBUG-83630 Task-number: QTBUG-94764 Change-Id: I1aec8571dcdcc2103d0e56c3d0bbfc4a4872d8db (adapted from commit b69d071c10dfa4c5d7b62692b8a9d7bb659a4ab5) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Doc: make it clear that Page doesn't render its title textMitch Curtis2021-07-021-0/+3
| | | | | | | | | | | | | | | | | | This is demonstrated in the example, but it's better to make it clear. Change-Id: Ie5efcca2256da6a03d31df9cf045f4a97d1ad1ed Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 41766ac6d6e100b69d74c98edde60f0835b7da13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QQuickComboBox: fix acceptableInput being wrong if no validator was setOliver Eftevaag2021-06-171-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an issue with hasAcceptableInput(), if the property would be read before the contentItem had been set by the qml engine. This would cause hasAcceptableInput to return false by default, even though the default value is supposed to be true, if no validators or inputMasks are being used. The solution that I've chosen, is to give the QQuickComboBox its own acceptableInput variable, and connect the contentItem's acceptableInputChanged() signal to a function that polls for the contentItem property, and updates its variable accordingly. Fixes: QTBUG-94307 Change-Id: I587d76162e75544a7ed1df9e3b9104bd73013bb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f8db2b996f339ad7e0754cd232f1e71ebecf6367) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Add recursion guard to QQuickApplicationWindowPrivate::relayout()Jan Arve Sæther2021-06-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | relayout() might change the size of the header, footer or contentitem When one of those items changes, QQuickApplicationWindowPrivate will get notified by that through QQuickApplicationWindowPrivate::itemGeometryChanged(). itemGeometryChanged() will then call relayout()... (*recursed*). Task-number: QTBUG-87708 Change-Id: I9403952e776afb2be37d009642c65b5520c79341 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 6dc95399797de4ec27984956df1fa587f4eb18ba) Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| * Fix SwipeDelegate losing swipes to parent flickablesMitch Curtis2021-06-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | Use a smaller threshold than Flickable so that it doesn't steal our events. Fixes: QTBUG-55705 Change-Id: I7e985c27788818226a3158078d485ea12ddd7006 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 887af04857f366c393512573cafebccde2678d6d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * ToolTip: use contentWidth of Text contentItem to account for newlinesMitch Curtis2021-06-095-4/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, QQuickPopupItem uses the implicitWidth of its contentItem, which is too large in the case of a ToolTip with newlines in the text. In that case, contentWidth refers to the width of the text including newlines, so we use that instead. [ChangeLog][Controls][ToolTip] The implicit width of ToolTips now accounts for newlines in the text. If you want to use the old behavior, set ToolTip's contentWidth to implicitContentWidth. Fixes: QTBUG-83630 Change-Id: I7ca3805429acb68a13ead8f3545bb84a51fb1b72 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a063cd0be5e8f108a0084831856f4af8c0e9159c) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-1916-111/+263
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iec31024aafdb1785574ba6450ca754f4660c05ee
| * TextArea: Detach the flickable when it is deletedAndy Shaw2021-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | When the flickable is deleted before the TextArea is (which can happen when it is a child of a ScrollView) then we need to make sure that the TextArea no longer keeps a reference to the Flickable object. Fixes: QTBUG-93958 Change-Id: I1745065370718e60bc459192e15eae0e1ba36231 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 4cba29c38cb1b610bf896130050b6c14b7e10c71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Don't call QQml_setParent_noEvent with a nullptr itemVolker Hilsheimer2021-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Since we check for item being nullptr just before it evidently can be, in which case QQml_setParent_noEvent would access that nullptr. Fixes issue raised by code checker in 23fe43ee0a0838e3b680f6dc55cd226e Change-Id: Ic5306c0c8d89734a606ab90addc6540621696553 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b2f4ee87d888941fd548d9a4009711d1c018073e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Hide old scroll barsMitch Curtis2021-05-191-0/+16
| | | | | | | | | | | | | | | | | | | | | | Reuse the hideOldItem added in 80f1186338bcf8c7d692b4fadfc46531c002c6b0 to unparent and hide them. Fixes: QTBUG-89126 Change-Id: I641e46571b8ac42e0e5080b6737f305ff59afd51 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 908aa77d16e00f2bccc0ddae0f8b61955c56a6a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * 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-041-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-1/+11
| | | | | | | | | | | | | | | | | | | | | | 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-073-3/+19
|\| | | | | | | | | | | 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>
| * ComboBox: don't focus TextField when clicking on indicatorBartlomiej Moskal2021-02-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-6/+15
| | | | | | | | | | | | | | | 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-021-4/+19
| | | | | | | | | | | | | | | | | | | | | | 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-027-0/+227
| | | | | | | | | | | | | | | 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-141-2/+3
| | | | | | | | | | | | | | | 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-143-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-4/+26
| | | | | | | | | | | | | | | | 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-061-3/+8
| | | | | | | | | | | | | | | | | | 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>
* QQuickAbstractButton: don't accept key release if we're not pressedMitch Curtis2020-10-221-1/+1
| | | | | | | | | | | | | | 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 03:45:40 +0000