aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.12.125.12Jani Heikkinen2021-10-041-1/+1
| | | | Change-Id: Ie1d49d79ffdee7c5663fa0ad2efe4723ea59118a
* Bump versionv5.12.11Jani Heikkinen2020-11-061-1/+1
| | | | Change-Id: If86c7de9ae7c2ac926b337095524c1d1076d86a5
* 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>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: Ida7f4e0bd0a491f22acdfcce50f9ed0be21502bd
* 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>
* Fix crash on exit when centering Popup within Overlay in StackView itemMitch Curtis2020-08-174-1/+128
| | | | | | | | | | | If a Popup is centered within an Overlay, and that Overlay is destroyed before the Popup, we must make sure centerIn is cleared so we don't try to access a dangling pointer. Fixes: QTBUG-84579 Change-Id: Icb2750f847f9d5710725bedc4d1c92bf4c122c03 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 04901b170e009d844232067446fdd56f270d155d)
* QQuickPopup: fix focus when multiple popup exitingWang Chuan2020-08-103-5/+141
| | | | | | | | | | | | | When a focused Popup exited, it will try to transfer focus state to next Popup in chain or other item. However if there is an unfocused Popup exiting simultaneously, the focus state will be transferred to unfocused Popup, and this will cause loss of focus state since an unfocused Popup won't transfer its focus state to next Popup(or item) Fixes: QTBUG-79464 Change-Id: Ic06bd5a3616c8afbce449266e6fc24d2d54059d9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f9877da406ad96d82becb15b6eef9b723b8807e3)
* QQuickApplicationHelper: don't use QTest macros outside test functionsMitch Curtis2020-06-187-5/+98
| | | | | | | | | | | This has no effect. Task-number: QTBUG-66320 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 969a724352dfe3250efb871c70f9482d7b780165) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: Ica0a79d8c5feeb6f4bafcfaa1dd8cf7b0660ab5e
| * Merge 5.12 into 5.12.9v5.12.9Paul Wicking2020-06-054-20/+64
| |\ | |/ |/| | | Change-Id: I378438b043896fb76ce4007da7442f5322a63a06
* | StackView: fix heap-use-after-free when pushing after clearMitch Curtis2020-06-034-20/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch extends the work done in aaec25a7 to cover all operations. Note also that b94889f4 does a similar thing to this patch and aaec25a7, in that it explicitly ignores operations that are done during the removal of elements. Fixes: QTBUG-84381 Change-Id: Id8bbbded39d8e58bcf0e8eedeb2dde794952333f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit b67cc148693de06370633cddf82a31664004e65c)
| * Add changes file for Qt 5.12.9Antti Kokko2020-06-051-0/+20
|/ | | | | | | + 851fe98a0e76364d09275d0e2f391cea789ace54 Bump version Change-Id: I574469050c2632ed71c7897050beb8af72289b0f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: Ifdad3fd8f073861f27b295451bd858d2d8582a04
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I11e2640c15ea0007263c6d06eafde86bb83ff31f
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-171-0/+20
|/ | | | | | | + 88036c197696b405af1c1efb90db16238c38c9ab Bump version Change-Id: I804b75971a994588bac19a9e325e7d86d375b431 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+26
|\ | | | | | | Change-Id: I3ffb36f9414c7adf30718912ec61533487f86830
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-211-0/+26
| | | | | | | | | | | | | | | | + c7c8ab7a74ec3370ff5022d27bb8137a52edd433 Bump version + 16c983f3eeb2cbc83e863a43cd288d788aedefdc StackView: fix crash when recursively removing items Change-Id: If261904f4374eb0fa14942e9042fdf171e5acea0 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+26
|\ | | | | | | Change-Id: I9b423765c6f798206588684c807981bb963e64d1
| * Add changes file for Qt 5.12.6v5.12.6Antti Kokko2019-11-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 62c45cdcd48e436c7d81d668b4da36c30928f871 examples: type userto -> user + 5189f2bc470da7ff6ae83d0108dd4e6abf35e04e Doc: Rename section title for 'TabBar' + 315fabdb574d9952a072ec7122266f59011c0257 Minor typo fix + 7ce1bdfe79d5c9aeb7202fb38b4174028ea2bf9c QQuickPopup: fix compiler warning + 7c1b29575db0f1e892d68fb2bd0cf894f18fafd5 Modernize Gallery example by using Action where suitable + 1e99cb6e809ff0c8647c5017c11ead68ae1a591d Fix flakiness in tst_qquickdrawer tests + 616c430d2b7f36e70987df7b2dc97e71f0e8b589 ComboBox: document the behavior surrounding the accepted() signal + 382531ab5e2270833d3805c57c00ebcf6b24d635 QQuickIcon: properly resolve implicit values + 9d9ba61a7503047e8417a52e3799f51e76067df8 Tumbler: fix displacement calculation when wrap is false + e6ccc83aced775621c54f2b563462b57d3fe2e01 Fix a crash on exit when using ToolTip in a specific item hierarchy + 62105a2f4c688d4646330113af9f4553b3d85927 tst_qquickpopup: ignore ShaderEffectSource warning in debug builds + 2e3363001dea1fa833d99eebf8cacfa3c8185f7e Bump version Change-Id: Idf6f77f1da0d8c67d4695883bca08616a4a510a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | StackView: fix crash when recursively removing itemsMitch Curtis2019-12-093-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen when e.g. calling clear() in Component.onDestruction in response to a pop() call. The patch fixes the crash by warning and returning early. If users really need to do this, the clear() call can be delayed: Component.onDestruction: { Qt.callLater(function() { stackView.clear(StackView.Immediate) }) } Change-Id: If3cf07495bb34b96089522f44c36976bd6c62492 Fixes: QTBUG-80353 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit aaec25a798352fc222f86ab3b299384575f51dc8) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* tst_qquickpopup: ignore ShaderEffectSource warning in debug buildsMitch Curtis2019-10-141-6/+8
| | | | | | | | | | | It was commented out but should have been #ifdef'd, and the explanation is wrong. This amends 83fbf44. Change-Id: Ibe752d63a42805361b13edc6beafcf1f3738f02f Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 9685d8f97e8bb448c90dd87b4e86c0ea8438436a)
* Fix a crash on exit when using ToolTip in a specific item hierarchyMitch Curtis2019-10-143-1/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickPopup connects its parent item's (MouseArea, in this case) windowChanged() signal to QQuickPopupPrivate::setWindow(). It does this so that: 1) QQuickOverlay can keep track of all of the popups that it manages. 2) Fonts, palettes and locales can be resolved. 3) If the QQuickPopup component has completed loading and the popup is visible with a valid window, start the enter transition. The problem arises only when using a very specific item hierarchy: Window { width: 640 height: 480 visible: true Item { anchors.fill: parent Item { anchors.fill: parent ColorOverlay { source: parent anchors.fill: parent } MouseArea { anchors.fill: parent hoverEnabled: true ToolTip.visible: containsMouse ToolTip.text: "ToolTip text" } } } } When the window is closed and hence begins to be destroyed, the following events occur: - QQuickWindow's destructor is called. - The window's root item (QQuickRootItem) begins destruction. - QQuickOverlay is destroyed. - QQuickWindow's destructor is done, so the QWindow and then QObject destructors are called. - The QQuickItem destructor for the outer Item is called. - The child items of the outer Item have setParentItem(nullptr) called on them, one of which being the inner Item. - The inner Item's setParentItem() function calls derefWindow(), which in turn calls derefWindow() on its children. One of those children is MouseArea. - Since the MouseArea's window is deref'd, it emits the windowChanged() signal. MouseArea is the parentItem of the popup, so its windowChanged() signal causes QQuickPopupPrivate::setWindow() to be called. - setWindow() tries to remove the popup from the old overlay, which has already been destroyed. One approach I tried involved using QQuickOverlay::itemChange() to remove all of the popups (via setWindow(nullptr), to ensure that their window pointer is nullified), since that was called much earlier than the windowChanged() signal is emitted. However, this still resulted in a heap-use-after-free in the same place when running the newly added setOverlayParentToNull() test. I also tried removing the popups in QQuickOverlay's destructor, but this resulted in another heap-use-after-free (when accessing a popup in the destructor) in tst_QQuickPopup::Universal::visible(). The remaining options were: store the window in a QPointer or return early in overlay() if the wasDeleted member of the window was true. Using QPointer seems like it would catch more issues than a single check in overlay(), so I went with that. Fixes: QTBUG-73243 Change-Id: Ieb5ce26dd76d45771d28297031ec43e27d958b5b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 83fbf44b980c4a072ede122f2f16921bfff8c08d) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Tumbler: fix displacement calculation when wrap is falseMitch Curtis2019-09-252-6/+38
| | | | | | | | | | | | | Use the position of the item and the currentItem in the calculation in order to get reliable results. This fixes the displacement being off by a small margin, which increased as the delegate height became smaller. Fixes: QTBUG-66799 Change-Id: Ieca5033fb4c0ed62f5965a21fcab7aa558bd40e6 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d39a6d80f63414a4e933ac2f859805635850942a)
* Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+28
|\
| * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+28
|/| | | | | | | Change-Id: I9f62c952a3a059601c1486806c0fb4189ffc368d
| * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-261-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 335314146dece4fa86c661a4094a2f73e5e81a43 Doc: Fix documentation warnings for Qt Quick Controls 2 + 761df2ced0081905b4238c66783bb276f504cf3d Accessibility: Switch should have checkbox as role + 2ea51ddea2b903d8115648a89d56b1e4b551e660 Accessibility: Remove redundant checkbox role code + 48f587be28e8b46e93703d7a4393b915b224495f Doc: Add specs about focus property + 188773bd1383883cd7247b6ded0d0b1a41689155 Doc: correct name of property in snippet + bb88d84475f7c4bb69528da5096f4d2c91667a3c Add a test for having a ShaderEffect as a delegate + 3574033d526c0a78236148354e1f48d7b9aafe10 Bump version + ce7c431fb23157fa5125d1102a594de045818a72 Fix crash in QQuickContainerPrivate::removeItem + 1d06eb3f8215b67c5061ee3a076df405724ff7ee Fix Flaky tests + da06da57002b64cf4bcde0ca708b3275a5f919ae QQuickTextArea: prevent changing size of background recursively Change-Id: I139ae9181197f900aab385bd0a93c6902d3b22f1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickIcon: properly resolve implicit valuesKonstantin Ritt2019-09-062-6/+12
| | | | | | | | | | | | | | | | when the property has not been set explicitly, the resolved mask must not contain a respective bit set either Change-Id: Iab0bd600b5bf458e26ed4601d4d2f608021f1518 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ComboBox: document the behavior surrounding the accepted() signalMitch Curtis2019-09-062-18/+62
| | | | | | | | | | | | | | | | Change-Id: I65be8e54ded284d2f80b5a1f301b75223bd81bb3 Fixes: QTBUG-75338 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix flakiness in tst_qquickdrawer testsMitch Curtis2019-09-062-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Although it's not ideal to add arbitrary delays to tests, it does reflect a more realistic testing environment, and more importantly, seems to fix the flakiness on OpenSUSE. (cherry picked from commit 97fc102cd079f32cc1a4f00a764ceea981699fc0) Fixes: QTBUG-77946 Change-Id: I2998611759106386091d7375b31e56523c95371f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Modernize Gallery example by using Action where suitableKonstantin Ritt2019-09-051-17/+24
| | | | | | | | | | Change-Id: I45c693941e88074eb63f9e6a498c85c1dfa93e9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickPopup: fix compiler warningKonstantin Ritt2019-09-051-0/+1
| | | | | | | | | | | | | | | | > warning: unannotated fall-through between switch labels > note: insert 'break;' to avoid fall-through Change-Id: Ia70fb6b666f874a245a113d61a6cb3e8e7aa2712 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Minor typo fixKonstantin Ritt2019-09-051-1/+1
| | | | | | | | | | Change-Id: I335e59f09c48a8b52c7f690cedba95952c5adfa3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Rename section title for 'TabBar'Topi Reinio2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | Having a section title identical to a QML type name caused links intended to go to the QML reference to link to this page instead. Fixes: QTBUG-77840 Change-Id: I06219a67fd384c51be6080ef7ef8579b6a405d0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | examples: type userto -> userAlbert Astals Cid2019-08-221-1/+1
|/ | | | | Change-Id: I99d9ea22fd51aa4e9da469b630b319ba71215558 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickTextArea: prevent changing size of background recursivelyWang Chuan2019-07-242-3/+42
| | | | | | | | | | | | | | | | | When the x/y position of background depends on the height/width of background and these values are not constant, the if statement in the method resizeBackground() will always pass. And since a change listener is set before calling setHeight()/setWidth() in background, these two method will always call resizeBackground() and then call themself recursively, that means the height/width of background will always be reset, no matter what value you set. [ChangeLog][QtQuick][QQuickTextArea] defer adding change listener and prevent changing size of background recursively in construction Fixes: QTBUG-76369 Change-Id: I2ec37cad7f35cb1c756276326fe69e860c6b8de5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Flaky testsDimitrios Apostolou2019-07-222-23/+23
| | | | | | | | | | | | These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix crash in QQuickContainerPrivate::removeItemJüri Valdmann2019-07-031-0/+1
| | | | | | | | The count variable should be updated after removing the item. Fixes: QTBUG-76164 Change-Id: I141d720ffaa890002d98a7d2448adca9a7d7d2f3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: I3d0cfbbd68b361f006a455e46e17e0da28823373
* Add a test for having a ShaderEffect as a delegateJan Arve Sæther2019-05-221-0/+58
| | | | | | Change-Id: If4f3dca99638015b479509e4aa73e0190b1182ac Task-number: QTBUG-67343 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: correct name of property in snippetNico Vertriest2019-06-181-1/+1
| | | | | | Task-number: QTBUG-75558 Change-Id: Ic9856c6f6da4e0beefe2fe6f1bbaea8fdd67ea0d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Add specs about focus propertyNico Vertriest2019-06-181-0/+13
| | | | | | Task-number: QTBUG-75546 Change-Id: I6e672c3a8390c4cf10dc9576cc3bf1eb10a6246b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| |\ | | | | | | | | | Change-Id: I589b709ab12bb2b55596079f53ef147a82f23a3e
| | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | Change-Id: I2389ce274d609c13055e82408f38d30c6e921e5c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | Change-Id: If3c56e80803135ac7e1ce99033da8e3dd09ad7a9
* | | Accessibility: Remove redundant checkbox role codeFrederik Gladhorn2019-06-132-11/+0
|/ / | | | | | | | | | | | | | | To make switch work, the base class now returns checkbox when it has the checkable property. With that change, this is no longer needed. Change-Id: I41d8f774cb244f922b859fd9f2dde75913e965b6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>