aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-094-5/+56
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9a361b46c1ff401d6e58c31b1fd46241ec9ebaea
| * Fix scroll bars not showing up when binding to standalone contentItemMitch Curtis2022-09-024-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 908aa77d16e00f2bccc0ddae0f8b61955c56a6a1 hid old scroll bars, but didn't account for the situation where the old scroll bars would be put back into place, and so they never showed up. In the case of the linked bug report, since there was a binding to the ScrollView's contentItem, a default Flickable would be created. After that binding was evaluated, the contentItem was set, causing the scroll bars to be hidden (as part of the process of disconnecting from the old flickable). To fix the issue, we now do the reverse of hideOldItem when a new contentItem is set. Fixes: QTBUG-104983 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Nate Graham (cherry picked from commit 58bae53237417f28eac6d772fa6ecab657f8a73f) Change-Id: I0d5d04cf9268e03b99c8b8fba2eee407e225ae56
| * Take over touch grab after initial delayed mouse press from FlickableShawn Rutledge2022-06-131-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has always caused a lot of trouble that Flickable only knows how to replay mouse events, not touch events, when pressDelay is set. Only the press is delayed; then if some recipient grabs (e.g. by accepting the mouse event), it grabs the underlying touch point ID, and thus the following touch moves and release will be sent to it as QTouchEvents. So, delegates in itemviews receive touch presses as mouse events, and then touch events; and perhaps it's risky to assume that's all the same sequence just because pressWasTouch got set to true, but now we do it under either of two conditions: touch release occurs near the mouse press, or the touch has been dragged past the drag threshold. (The real fix is in Qt 6: Flickable knows how to replay touch events.) Amends and extends 025f938c1b4676782674d54375e1e4e560e4b6cd and fcc3d346c8aaff74b0054974040d3c1250301563 Task-number: QTBUG-77202 Fixes: QTBUG-104009 Change-Id: I7e1980e2fbc9b7a1b53c56409fb8a7adc424d61c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: Fix link to Scrollbar size propertyAndreas Eliasson2022-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | The \l command with just one argument, size, has a competing section1 link target, Size, in a different C++ file. Specifying the C++ class as the first argument to the link command will make sure that the link goes to its intended target. Task-number: QTBUG-103250 Change-Id: I4c56685832b2b4b1772a8b63590c333f4f8e3ab5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-249-5/+23
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1e6656a4356246b153ca4bfb210027ad46242e5a
| * TextArea: make clip node wider to accommodate cursor when right-alignedShawn Rutledge2022-05-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | TextArea { horizontalAlignment:TextEdit.AlignRight } draws its cursor past the right edge of the text itself. 1 px seems to be enough. Fixes: QTBUG-84280 Change-Id: I7aa58249f97c7f25a7caf3adc01e1a46917508c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d75ab891ed37d67f1614fe0f19a1e506bb564970) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * DialogButtonBox: fix buttons going outside box on size changeMitch Curtis2022-04-285-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed in c2fd8f7d00e2a47724765e289b828c36c98da29c, but seems to be necessary now. A horizontal ListView's implicitWidth is 0, so setting it to contentWidth seems reasonable regardless. For more history, see 8b78d9cea3091b0bd94d1ae0c71a000f8e7e1903. Fixes: QTBUG-102558 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 2ae87dcece1915797de8065048817707c8f4d24f) Change-Id: I3d67bcd5dbc0297620847f27363acce43a5dc862 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * Control in pressDelay Flickable: detect touch release near press posShawn Rutledge2022-04-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a control is on a Flickable with a pressDelay, any press event from a touch device will be replayed as a mouse event due to the delay; so it was known already that we cannot depend on the fact that we got the first press as a touch event when checking whether the id matches before accepting it. So we keep the previous pos when it is a synthesized mouse event, so that we can ensure the release is also accepted. That was in place already; but now we no longer require that the release position is identical to the press position: staying within a distance less than the drag threshold is also ok. Some touchscreens are too sensitive, some users have shaky hands, so a "tap" gesture may come with some gratuitous TouchMove events in between the press and the release. Amends 025f938c1b4676782674d54375e1e4e560e4b6cd Fixes: QTBUG-102036 Fixes: QTBUG-102037 Task-number: QTBUG-77202 Change-Id: Ic48b0cca2b1c05b36429925f219d75b1b0085f69 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Reset provider's texture if QQuickNiniPatchImage's source is invalidSukyoung Oh2022-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When QQuickNinePatchImage is used as a source of other shader related object like ShaderEffect, OpacityMask or etc., there isn't a implementation to invalidate the provider's texture when QQuickNinePatchImage is invalid. It causes segmentation fault due to dangling pointer. Fixes: QTBUG-100508 Change-Id: I9ea25fe68b41d3b15503e3dccea3a816ad485a20 (cherry picked from commit 81bbd0b45aeb1eb98efd9153c79ebf4f0e4be839) Reviewed-by: <sukyoung.oh@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * FileDialog: do not add default suffix when content scheme is usedIvan Solovev2022-03-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Android when a file is selected using the default file manager, the selected file is reported using the url with "content" scheme. This url does not use file suffixes. Before this patch, if the FileDialog had a defaultSuffix specified, that suffix was added to the returned content url, and as a result the file could not be found. Fixes: QTBUG-94391 Change-Id: Ic6ba95e301857d9b72ee6f5ddb819b9aae9e66e3 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d10d1f97d0aadb1f26e99db1ef2c1c3d53458a38)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-234-7/+33
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I09434c9f6ff3112e4a8abe1bdf6036d789dfaabf
| * SwipeView: don't cull every child item that gets addedShawn Rutledge2022-02-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a055629f43cf8589ff6d69e46b2610429aaa4167. A SwipeView is a ListView, which means as long as the side-by-side delegates are the right size, only one of them should occupy the area of the SwipeView itself. The other delegates (isCurrentItem == false) are to the sides, and might be outside the window, hidden under other items, or clipped. So hopefully there are not users who rely on this culling to hide them. Fixes: QTBUG-99547 Task-number: QTBUG-51078 Task-number: QTBUG-51669 Change-Id: Ic90dc1c44b9a36dc717238b47003b4d88e91f789 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e10de033f4c44855de7287a97e2aa651f648742e) Reviewed-by: Seokha Ko <seokha.ko@qt.io>
| * QQuickAction: don't grab the same shortcut multiple timesOliver Eftevaag2022-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the entry for the QQuickItem that the QQuickAction is set on has already grabbed the shortcut, then m_shortcutId is no longer 0 and we must not overwrite the value. Otherwise, the QQuickItem removing itself from the action might not remove the correct entry from Qt's shortcut map, leaving a dangling pointer behind. Multiple calls to QQuickActionPrivate::ShortcutEntry::grab are possible, because we grab the shortcut whenever the shortcut changes, or when an item representing the action becomes visible. The test case added reproduces this scenario by adding the action to a menu item and then making the menu explicitly visible, resulting in two calls to grab() which should be idempotent. Fixes: QTBUG-96551 Fixes: QTBUG-96561 Change-Id: I7d42a4f4c04f7d8759f2d0f24a133720f10e4c47 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QQuickAbstractButton: fix crash on destructionUlf Hermann2022-01-192-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | If we listen for size changes we also need to remove the object listened to when it's deleted. (adapted from commit 720ffaeb60d43123522066e1de3a69ad551644aa in qtdeclarative) Fixes: QTBUG-99644 Change-Id: I9dc6ecc3636ee14f792dca8fa2d4bb5b3cdb3fa9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * AbstractButton: fix fast clicks being treated as double clicksMitch Curtis2022-01-042-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | Only emit the doubleClicked signal if it's connected to something. While we're at it, optimize isPressAndHoldConnected() by making locals static. Fixes: QTBUG-96888 Change-Id: I7b737d5ab75240bd06cc7f9daad7d848b8278d49 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 220a547aa440019ebcb1dd411ed95ecbf197e0f1) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 09:23:30 +0000