aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add changes file for Qt 5.15.2"v5.15.2Antti Kokko2020-11-051-0/+91
|\
| * Add changes file for Qt 5.15.2Antti Kokko2020-11-051-0/+91
| | | | | | | | | | | | | | Pick-to: dev 5.15 Change-Id: I5bf32a9ba9f5e3f10f23ffe78bceecdfaa23fbc2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Revert "qquickloader: Free memory of loaded components after source change"Maximilian Goldstein2020-11-021-13/+0
|/ | | | | | | | | | | This reverts commit c5085eb8905f1a3c070f866746110980e84be271. It can cause crashes and only fixes an edge case that can't be encountered during normal usage. Change-Id: Ia265f0d6716b59a0f483e5a114b3f3b1a76fe898 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 0fa6091b1076bc3cc58303ff00d43efdad32b8ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Inline components: Fix custom parser supportFabian Kosmale2020-10-283-0/+30
| | | | | | | | | | Fixes: QTBUG-85713 Fixes: QTBUG-87464 Change-Id: I5c190ad2d02190de90260042cc06e51c1da01c63 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 2425cd478138c52694aaa20b7f7eb4a91d97b51c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TableView: ensure we rebuild the sync view, even when flicking on a sync ↵Richard Moe Gustavsen2020-10-263-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | view child When two table views are connect through the syncView property, both views will flick when you flick on either of them. This also means that if you fast-flick more than a page on the sync view child, the sync view needs to rebuild, like if you did the fast-flick directly on the sync view. Because we updated the sync view's viewportRect too soon while fast-flicking on the the sync child, we didn't detect that it was a fast-flick, and that a rebuild was needed. The result is that you could sometimes end up with the views getting out-of-sync. This patch will allow TableView to only move the viewport without updating the internal viewportRect while flicking. The viewportRect will instead be sync-ed at a later point, like we do when you flick on the sync view directly. This will ensure that we rebuild if needed, also while fast-flicking on the child view. Task-number: QTBUG-87821 Change-Id: Ifc74473eb43406acaa8e24880066fb4ca89d3a4e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b5501e9043cabcbf74d3d53b424ece5deb706a27)
* Fix compiler warning: mark overrides as such, remove virtualVolker Hilsheimer2020-10-231-6/+6
| | | | | | | Change-Id: I77bd88eb0f277c139fd296c1dafa8b09517a3064 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c31c4068f87bb65328b4d25ca0c8d428ab8f74a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update and activate tst_animatorsShawn Rutledge2020-10-233-20/+33
| | | | | | | | | | | | Amends a0f8be4021caa9bb5055923f0eea3bee0e345235; it's not clear if there's any reason we haven't been running this test all these years. But we need to use testFileUrl() for loading QML files, and some additional updates make it more like the other tests. Change-Id: I3ddcc993c4536c2d4d751a37c0425943c7d86766 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ec9d125f553c073ec7a431114a568eaeb6534b63) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* TableView: ensure we update content size upon model changesRichard Moe Gustavsen2020-10-223-40/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For tables of non-trivial sizes, we usually don't know what the content size will be unless we load all rows and columns, which we simply cannot do. Because of this, we have up till now chosen a strategy where we normally just calculate a predicted content size up-front, when we table is built, and afterwards just stick to that prediction. This strategy works for big tables that fills more than one size of the viewport, and if the number of rows and column in the model stays around the same. But for tables that start off smaller than the viewport, and later expands to grow out of it, it simply fails. And the failure is such that the tableview can get stuck, with no way way for the user to flick around to see the rest of the contents. An example is TreeView that might only show the root node at start-up, but as you start to expand the tree, it will quickly add more rows than what fits inside the viewport. And in that case, the contentHeight will be totally off, and in turn, make the scrollbar be based on wrong values, and sometimes not work at all (e.g if it has the flag Flickable::StopAtBounds). This patch will change the implementation so that we recalculate the content size whenever it should logially change. That is, if e.g the model add or remove rows and columns, or if you change spacing. This still doesn't mean that contentWidth/Height reports the correct size of the table, but at least it will be a better guestimate for smaller tables, and at the same time, work together with Flickable and ScrollBars. Fixes: QTBUG-87680 Change-Id: Ie2d2e7c1f1519dc7a5d5269a6d25e34cf441b3fe Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit dac2c8aec4917742aed6e311cf542dc37da60809)
* qquickloader: Free memory of loaded components after source changeFabian Kosmale2020-10-211-0/+13
| | | | | | | | | | | | | | Since we cannot be sure when the event loop that would usually handle deferred deletions will run the next time we have to delete these components immediately otherwise we might run out of memory. Fixes: QTBUG-86676 Done-with: Maximilian Goldstein <max.goldstein@qt.io> Change-Id: I01d74f7eea442f8ba240dd66a4cedd6316fbeec2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit c5085eb8905f1a3c070f866746110980e84be271) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix OPTIONS argument of qtquick_compiler_add_resourcesJoerg Bornemann2020-10-211-1/+1
| | | | | | | | | | The OPTIONS argument is stored in the variable rcc_options, not options. Pick-to: 5.12 Fixes: QTBUG-87721 Change-Id: Ibd04ada18461fa1c052be46f3c7aa9cb28f31e8f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-201-0/+32
| | | | | | | Change-Id: I2e4039eb1c1d030585dc85a1e05db642a9c6e37a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 36e4e9bbd402cefab9d7b68635a94a02e0b41187) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: mention that clipping can affect performance and link to pageMitch Curtis2020-10-191-0/+3
| | | | | | | Change-Id: I85e60dd5c8643a8e443a14250987b2b38c78dc08 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit c1c01e21d1a745eccb17d61e10d7f8a4d54d3a43) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickShaderEffect: fix crash when hiding parentMitch Curtis2020-10-193-1/+152
| | | | | | | | | | | | | It's possible for itemChange to be called during destruction when deleting the QQuickShaderEffectImpl. We nullify m_impl before deleting it via another pointer to it, so we must check that it's not null before trying to use it. Fixes: QTBUG-86402 Change-Id: If4955445f7cc0d1f376bc9b86b95e1cca4d88ede Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 266cd7638d887b31d56964a0f13fe208821703b1) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix alwaysRunToEnd==true prevented complex Anim from stoppingPiotr Mikolajczyk2020-10-167-0/+177
| | | | | | | | | | | AnimatorProxyJob would not forward loopCount to the controlled job causing the sequential or parallel animation to go infinitely after attempt to stop Task-number: QTBUG-82890 Change-Id: I6a1ca787f06789064e05407bbe9ae5e5861f24d5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit d66d0540dc323e6a536b952acedcfda70cd90c0c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* [Fix] Use the sourceDir if specifiedAssam Boudjelthia2020-10-141-1/+7
| | | | | | | | | | | Android is passing the test path via QUICK_TEST_SOURCE_DIR but it was set to ":/" no matter what. Change-Id: If0e6615999019cf1869a237056d41e35b5be12f1 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 66285fd4954b061a5f912f690704c0bdcadf5c98) Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* QQuickTextEdit: ensure we update document width when padding has changedRichard Moe Gustavsen2020-10-083-2/+36
| | | | | | | | | | | | | | | | We use an if-test to check if the document width has changed before we set the new value. The problem is that the value we test against is different than the value we set. The result is that we can sometimes skip setting a new width on the document, even if padding has changed. This patch ensures that we use the same width for both testing and setting. Change-Id: Ia8391999e8cc2b5be72fe525d396bf8c17ba0fa2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 40993321cd67c1fe722977ed94c91cedff4bb1f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickListView: prevent mouse delivery in floating header or footerShawn Rutledge2020-10-076-16/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | Earlier we reimplemented the contains() method of ListView to prevent dragging in an Overlay or Pullback header or footer. But in QQuickWindow (QQuickWindowPrivate::pointerTargets()), an early check prevents delivery of pointer events to an item that is clipped and for which contains() returns false, and also to its children. In that case, the header or footer no longer responds to a mouse event even if you put a MouseArea in it. Reverts 6ad3445f1e159d9beea936b66d267dcaacdc5d6c; reimplemented using similar logic in a new QQuickListViewPrivate::wantsPointerEvent() method, overriding QQuickFlickablePrivate::wantsPointerEvent(), which is now checked in event-handling code in addition to checking the interactive flag. Done-with: Wang Chuan <ouchuanm@outlook.com> Task-number: QTBUG-74046 Fixes: QTBUG-85302 Change-Id: I9474f035d26b74ee36c0ac19e45a77de2e694bf1 Reviewed-by: Wang Chuan <ouchuanm@outlook.com> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 6857ad3e686a5e2b45d28a7f47dca3210608da50) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* qmlformat: Fix computed property namesMaximilian Goldstein2020-10-074-1/+39
| | | | | | | | Fixes: QTBUG-87222 Change-Id: If1da02d503041009b82651e1087fb4a1bdd79d59 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 49391fcc41d871836868452b8300938d0b94f00e) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmlformat: Fix formatting of for...of loops using array variablesMaximilian Goldstein2020-10-074-1/+32
| | | | | | | | Fixes: QTBUG-86980 Change-Id: Id27350821051709894c7645a362cfdf7ce0d279c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 9cfda79202c9c7955a1100861ed2135506302921) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: use editingFinished signal of TextInput instead of textChangedMitch Curtis2020-10-061-1/+1
| | | | | | | | | | | The former is only emitted as a result of user interaction, whereas the latter is also emitted as a result of programmatic changes. It's better to use editingFinished(). Change-Id: I71bb084bced6c33d940f550b5e3b2e57df45bd3c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 09b6ac481cc8027c79170706b329f028f33fb9f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmlformat: Fix inline componentsMaximilian Goldstein2020-10-063-43/+13
| | | | | | | | Fixes: QTBUG-86979 Change-Id: Ie8863bc2ecf75a9dd8e4af5e96e48c30e7acbacd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ecd018b4833863e9f7b8cecc616f681c361957b3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix lineedit exampleUlf Hermann2020-10-051-1/+1
| | | | | | | | | | | The default name created by QML_ELEMENT is the name of the local type, not the one of the foreign type. Task-number: QTBUG-87150 Change-Id: I2b5dfcea3e835d4e69d5fa4df179333a37ee1d6e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit e7d90fc5268cdca6aa10f422f00ad4a0049ea157) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qqmlimport: Use stable_partition instead of stable_sortFabian Kosmale2020-09-283-14/+26
| | | | | | | | | | | | | We do not actually need to sort the imports list, we just require that all inline component imports come before all other imports. This avoids triggering a MSVC STL debug assertion about the used Compare function not actually creating a strict ordering. Fixes: QTBUG-86989 Change-Id: I381852392545287ec02b186fcb4f33be3ae95b33 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 3eb9ee34c06d54ea21fedd3188c60e536a487b1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: Ie957b17eb2eb6d710d19dc030107bb82b826aa8a
* QQuickDrag: Do not crash when changing supportedActionsFabian Kosmale2020-09-231-0/+2
| | | | | | | | Fixes: QTBUG-82157 Change-Id: I9d694dd543f41b1ce2b6976983d03a3dc659245d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit dbb0d83779d09dca35f5ad6ee68a19f4e93eec1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix ubsan errorAllan Sandfeld Jensen2020-09-231-5/+9
| | | | | | | | | memcpy can't officially copy from nullptr, not even 0 bytes. Change-Id: Ie6ede9a861cb2ae7ab35a50db5aa6c82cea6ad76 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 90b5d7fa03f9818fa5edc897ee6a109fcc182b9e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmlimportscanner: don't include QtQuick.Controls.xxx.impl as depdendencyAssam Boudjelthia2020-09-171-0/+4
| | | | | | | | | | | | Since Qt 5 series include those modules QtQuick.Controls.xxx.Impl inside QtQuick.Controls.xxx, we shouldn't add them to the dependencies list. This also will silence androiddeployqt warning about invalid path for these modules. Change-Id: Ic8c8aa1248b170ab1d455484effb38d24a1b4d35 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 8ca9191580e218e5359c6703a42ae9595e4aca1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmlformat: Fix multiline comment attachmentMaximilian Goldstein2020-09-165-2/+40
| | | | | | | Change-Id: I3ba8a4cd683df3309dd6df31b1fd426a0875f8fa Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5d9b0d30df831649ceed58fee778bb37ac6f630e) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* webOS: Allow to have activeFocus for each windowElvis Lee2020-09-141-1/+25
| | | | | | | | | | | | This makes multiple windows focused if there is a single window per screen assuming that windows across screens don't compete the keyboard focus. Task-number: QTBUG-83361 Change-Id: Id6f6fd0c95747b03d56c5e535f1313c27d67ab24 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit a2c5f5abff3cafc5769588b573bb04cf950a0450) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Propagate focusObjectChanged signal (second attempt)Eskil Abrahamsen Blomfeldt2020-09-112-0/+14
| | | | | | | | | | | | | | | | | When the focus object is updated from inside the Qt Quick scene, the signal needs to be propagated from the offscreen window to the widget's window, otherwise the input methods will not react to it. Also, we need to propagate the FocusAboutToChange event, otherwise the contents of the editor will not be committed when the focus object changes, and the input method can get into an invalid state. Fixes: QTBUG-61475 Change-Id: I44ba171c0e78ef8b2e0127cba8991f1f1cf13571 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 362f6999a52849482e73915ca37ed4b6cc9ff9aa)
* Move the sharegroup with the context to the render threadLaszlo Agocs2020-09-101-0/+2
| | | | | | | | | | | | ...if the context does not have a share context, i.e. the QOpenGLContextGroup was created together with the QOpenGLContext. This is not applicable to Qt 6 where the context is created on the render thread and so there is no moveToThread() for it. Fixes: QTBUG-86524 Change-Id: Ida8b947548325ea2f7572cdb9373bbc90e4e7e4f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Screen example: avoid shadowing final props with required context propsShawn Rutledge2020-09-081-3/+2
| | | | | | | | | | | Amends 90b4528b846542bfa6f0723487315140b9de17b4 to fix the error qrc:/window/AllScreens.qml:75 Cannot override FINAL property Fixes: QTBUG-85724 Change-Id: Ie6528f6c9ccc6648ec76b4d237973588450cc932 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 99215e04e32c2138282abde3f2dc329d2f073d53) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix workflow for shutting down busy type loader threadsUlf Hermann2020-09-071-12/+10
| | | | | | | | | | | | | | | | We need to set the shutdown flag right away in order to prevent further thread events from getting scheduled. Those might lead to deadlocks. On the loader thread's side, however, we need to process the existing events before we process the shutdown flag, in order not to leak the events. After we are done with this routine, the thread will finish by itself. We don't need to wait on our mutex anymore. It's enough to wait on the thread itself. Task-number: QTBUG-75777 Change-Id: Id0afcb492d84617c78ff3bf94d0cc402aef2faa4 (cherry-picked from commit 0521b55f201299ee9f031f61d5bf8f2be18cf8c5) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Igor Kushnir <igorkuo@gmail.com>
* qmlformat: Fix template literalsMaximilian Goldstein2020-09-044-0/+15
| | | | | | | Fixes: QTBUG-85317 Change-Id: I52589b681690a55f7bba7d7d9c675dc22ffa1587 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 9df9059a4b88676c7352db92391de2c268550fc0)
* Doc: Capitalize "GUI" correctlySze Howe Koh2020-08-316-12/+12
| | | | | | | Change-Id: I2230e2dcb7bc2497b5dbe71a22c21d84176b5e57 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> (cherry picked from commit fd105380eb4f43c08578b6fe5ce3e5c6dd4b35d6) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Fix minor typosSze Howe Koh2020-08-304-4/+4
| | | | | | | Change-Id: I4c51c40697e410d56b6a2d2446ed9f8ae218576d Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> (cherry picked from commit 024ec9c564abfbe9aadd2193deeaa0d37464119a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Clarify DelegateModelGroup::setGroups() descriptionSze Howe Koh2020-08-301-7/+2
| | | | | | | | | The previous description had an awkward structure and was duplicated. Change-Id: I46dbc804e1c907198364f441fd46eb853db97e6a Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> (cherry picked from commit 3cf3434c1a898c834b2f0f6182068bbf8a95b9bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve lancelot test case for recursive ShaderEffectSourceEirik Aavitsland2020-08-272-29/+1
| | | | | | | | | | | | | | | Choose a rotation degree which makes it more obviously visible if it gets applied multiple times, and which avoids the risk of an accidental match by rotating a full round. As a drive-by, remove the second recursive test case, as it does not test anything other than the first. Change-Id: I019743cd8a85763c4704019f7fb7b24c3451308c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit ceb1d14bb30b560f20f2b5b3e75c8e228ddc0cb2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Follow layoutMirroring in Layout marginsDavid Edmundson2020-08-264-1/+56
| | | | | | | | | | | | | | | | If a layout is laid out left to right using the layoutDirection property, we want left Margins on the left, and rightMargin still on the right However, if a layout is mirrored, not only should the layout direction change but also the left margin should now be on the right and vice versa. Task-number: QTBUG-62989 Change-Id: Iaae4bc436fd1eb7f1947869563ac325f3d6b79bb Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 16613f3741af013f7e380c98df6889d73512d0ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add "we mean it" comment to private headerVolker Hilsheimer2020-08-251-0/+11
| | | | | | | | | Fixes warning from build system. Change-Id: If6c7885fa19f17b5821142176b6239bb337a6022 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit 277869faa33b796d68d4b0dab4970e70ca64a00f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickLoader: make sure the status property change properlyWang Chuan2020-08-252-0/+5
| | | | | | | | | | | | | When we call [setSource] in qml, we will try to convert a qml value to a string which indicate the url we want to load. However, if this value is undefined, it will convert to a string with content "undefined", and then cause loading error. More worse, if there is a qml file named "undefined", it will be loaded to the Loader. Fixes: QTBUG-85938 Change-Id: I5b192ba84aa29532e547349bbf37d413c107d8e4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 3d195d33ece3f8fd7cd7d8e6163fe038fc7fc036)
* QQuickLoader: make sure the status property change properlyWang Chuan2020-08-253-0/+39
| | | | | | | | | | | | | Since the invocation of [setSource] in qml will clear the old source url first, it is hard to decide whether we have changed the source url, especially when we call [setSource] with an empty string, and the loader's status won't change properly. Fixes: QTBUG-85938 Change-Id: If61a33c790a4fd6562611c4c50756bc5e213363a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 3aa4cd682f52b70803cc3f72d732bde9987677dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update tst_DragHandler::mouseDragThreshold zero-threshold test caseShawn Rutledge2020-08-241-7/+8
| | | | | | | | | | | | | | | | | | After qtbase b50daef9771d8829fc7f808898cbe051a5464b79, a mouse move event that does not contain a mouse location different than the last known location is no longer delivered. It's intended to be OK to set DragHandler.threshold to 0, and this test was checking functionality in that case; but we now need to move the mouse at least one pixel to test it. Then, the drag threshold is immediately exceeded, the drag begins, translation starts to occur, etc. Amends ab5df626bef9365089ce716ce476bccae1d0a04b Task-number: QTBUG-85431 Change-Id: I89c0dc13ed06fbf1443f42fa5b63713da56ecf6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 051e18a02fcdcb177cd602665424e53253f4d88c)
* QQmlObjectCreator: fix member func call with this == nullptrEvgeniy A. Dushistov2020-08-203-1/+21
| | | | | | | | | | | | | | | | The test example is based on qtvirtualkeyboard/src/virtualkeyboard/content/components/PopupList.qml Luckily ((QQmlPropertyCache *)nullptr) -> property(-1) is ended without access to this, so this was not caught before. But this is UB, plus I can not run Qt and my application compiled with -fsanitizer=X, because of it crashed after the first member function call with nullptr as this Pick-to: 5.15 Fixes: QTBUG-85605 Change-Id: If6a71fde9a14cc4f73139dfa0e6ee3005453104d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* doc, listview: document that binding to parent should be avoidedRichard Moe Gustavsen2020-08-201-2/+24
| | | | | | | | | | | | | | | | | | | | | | | Clearify in the documentation that the parent of a delegate can change during its lifetime, and even be null. And because of that, they should avoid binding to it. In general, how a control is structured internally should be understood as a private implementation detail. Even if the application has the freedom to read (and even change) the internal parent-child hierarchy as it sees fit, doing so can be fragile as the internal structure of a control can easily change from one version to the other. [ChangeLog][QtQuick][ListView] Since the parent of a delegate can end up being null during its lifetime, developers are now advised against using it in bindings. Fixes: QTBUG-82989 Change-Id: I2d6c79102435d0969f4dc3deec13c5fff4affeb1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ed73efa27acd8e7c42a960ef90c2e4a898c20c30) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* webOS: Share images even if cache is falseElvis Lee2020-08-191-1/+34
| | | | | | | | | | | | | | | | | | Regardless Image::cache property, pixmap will be shared between images having same source. Image::cache property had two aspect of internal functionality. 1. Share image instance if source file is same. 2. Store cache for a while even if unreferenced. So we couldn't choose one of them with existing the cache property. In webOS, sharing image instance is quite natural. So by default, the sharing is always supported regardless the cache property. And the property will only cares the 2nd functionality to store cache. Change-Id: I68208cf633ce2afd5f086a61dcc77d0f3d0da037 Task-number: QTBUG-83115 Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 60280cab2d96b0646469f3d85f8927c7baa166d1)
* Doc: Use correct type in QML documentationPaul Wicking2020-08-151-4/+6
| | | | | | | | | | | | DelegateModel.inItems and DelegateModel.inPersistedItems were wrongfully documented as of type int, when they are bool. This patch corrects that. Reflow long lines as clang-format complains.. Fixes: QTBUG-86031 Change-Id: I4dee919b7008b5d3b2f492ed894891ac164a1217 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 06b3d7ceb732588633e51e6580675b2a2595fe8d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmllistcompositor_p.h: Fix deprecated-copy errorMaximilian Goldstein2020-08-141-11/+2
| | | | | | | Pick-to: dev Fixes: QTBUG-86025 Change-Id: I83ce650e788aecdf4bebfc6a6a4331554f2c6be5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix -Wdeprecated-copy warningsFabian Kosmale2020-08-125-20/+6
| | | | | | | | | | Mostly by avoiding custom functions when the compiler generated ones work just fine (cherry-picked from commit f28b48b90e3230d1ce6bbcd5031ecb50089ec12b) Fixes: QTBUG-85998 Change-Id: If8152fd24c9084bd85be3741fc218709e50fc375 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Force Batch Rebuild if SubtreeBlocked includes an opacity changeAndy Nichols2020-08-121-0/+5
| | | | | | | | Fixes: QTBUG-85965 Change-Id: I2f5aba7fbde7ad2149d408d29db9219f33f13ca8 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit a4fb90f2239de76751922b3c54893a0207b59092) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:20:50 +0000