aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix for possible crash in QSGDefaultLayer::grab"6.1Laszlo Agocs2021-10-132-9/+0
| | | | | | | | | | | | | | | | | | | This reverts commit 1c5de027d0c31d1d6697bd0557128d92207763d8. The fix here is not correct. Calling a QSGRhiLayer function from the gui thread is very wrong and can cause a set of unexpected issues. The Address Sanitizer catches this by recognizing that the render thread is trying to do something with an object destroyed in the meantime on the main thread in the layer->setItem(null) call. The issue the original fix is trying to address needs to be addressed in some different form. Fixes: QTBUG-94975 Change-Id: I46f904026281201fc6d233ed7d3bdc7080934afe Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit a5f0361622eb08eab6c3474d5fc249d1962e3d1e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check for null pointer in QQuickPointerHandler::approveGrabTransition()Shawn Rutledge2021-09-291-3/+6
| | | | | | | | | | | Found by static analysis: https://testresults.qt.io/codechecker/daily_diffs/qtdeclarative/dev/qtdeclarative-dev-20210604-1285b67a11/qquickpointerhandler.cpp_51058486.html#reportHash=9b76a76200c3a2eceb0e115776dda98b Amends b09ce7dcd8ecf24ef23da8197a64e3fced3fc894 Change-Id: I4c35f648be9513e5e237d9b8d4e502e40e9f8a76 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 63b1f379b710c510f00311e03641aa65e72aaf34) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Reduce QGlyphRun memory usage and speed up large Text instancesShawn Rutledge2021-09-292-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To render the plain text of _War and Peace_ took 6.4GB of memory before (Linux 64-bit debug developer build); and now it's 1.1GB initially. More optimization is possible: sizeof(TexturedPoint2D) = 16, and we store a 16-bit index, so 3158176 glyphs ought to take about 60MB (but takes 200MB in practice); but we also store QGlyphRuns, which are actually redundant after the SG is populated. We need them in case the text can be edited, restyled, re-wrapped etc. QSGDistanceFieldGlyphNode::updateGeometry() enforces a limit of 65532 vertices per node (0xFFFF is not allowed as an index value, because it's reserved to indicate primitive restart; and glyphs are quads). But it was making copies of the remaining QPointF positions and quint32 glyph indices and giving those recursively to the subnodes, so every subnode was storing all of those for itself and all of _its_ subnodes, even though it only needs max 16383 of them. Now, in the RootGlyphNode, m_glyphs stores the glyphs that node will render (as before); but in each subnode, we use QGlyphRun::setRawData() to populate m_glyphs with a range from the index and position arrays from the root node. setRawData() just sets the pointers to those arrays; so to avoid any chance of dangling pointers, we need to keep those vectors, which live in the GlyphInfo structs in m_glyphsInOtherTextures. That's the reason the glyphsInOtherTextures hash, which was temporary before, is now kept (although the dangling pointers somehow didn't cause any crash). In the first loop over indices in updateGeometry(), each SubGlyphNode will break out of the loop as soon as it has created enough TexturedPoint2D and index instances for itself, because it no longer needs to redo the rest of the loop over indices that was done in the RootGlyphNode; this speeds up the rendering of large text. Creation of subnodes is now iterative rather than recursive, which saves stack space, and also looks better in the QSG_RENDERER_DEBUG=dump output: you can see that each RootGlyphNode has one level of direct children (161 of them for _War and Peace_). In a future change, perhaps we could create those dynamically when the user flicks down to them, and reclaim memory from children that are no longer shown; but that would not be possible if they were all nested inside each other. Amends aeb1d48c9938241b1ffcf8e42e3864595e90b168 Task-number: QTBUG-60491 Task-number: QTBUG-90734 Change-Id: Iff981b9ba86acc01775fd72e3ce79ea9e33d9061 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 75a9b09d93b9462b77347d1992371a189037bc62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Flickable: don't react to any mouse button other than the leftShawn Rutledge2021-09-283-1/+66
| | | | | | | | | | | In case of mouse "chording", ignore all other buttons. Fixes: QTBUG-96909 Change-Id: Ib091b271390c5b4e3aafbbe24d2dc7b6f08db175 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f91aa3b4d8ae7bfba65a8252099ded3b428f7acf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-09-281-2/+2
| | | | | Change-Id: I50fd5844e111f9af20c70598e572750cf1ffbb4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-09-231-2/+2
| | | | | Change-Id: If3d0d24605f2a12192b895cc6ffcb11267bbdede Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-09-141-2/+2
| | | | | Change-Id: I787dda867da00ac521624a91d438e370ab8171eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Correct the type that WheelHandler's wheel signal emitsShawn Rutledge2021-09-061-1/+1
| | | | | | | | | | It's WheelEvent not PointerScrollEvent. Task-number: QTBUG-81302 Change-Id: Ie03fbf60492525301ee8d60a0c38c8a111251e0a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit e2e7a1c5b81e4e7464134b4590aea799b0434d55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update the QRhiTexture size in QSGPlainTextureLaszlo Agocs2021-09-051-1/+6
| | | | | | | | | | | | An autotest is added separately for dev only because the necessary infrastructure for sophisticated scenegraph tests only exists there due to some earlier commits that are in dev and not in 6.2. Fixes: QTBUG-96190 Change-Id: Ie2adee96864b60f982a83b9b2785a93d5401bd6a Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 4de27382f9b5f05b8d5821247ea7653b44264c03) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: Ia126d39fe1ccc3a94ed56d218b186a77e311fd1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-09-031-2/+2
| | | | | Change-Id: I0e087b47807c2cd1f176a7c0eec49bcee6eb546c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-311-2/+2
| | | | | Change-Id: Id158c096239a6bdc7224c132ab3ea67f0d547e25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-271-2/+2
| | | | | Change-Id: I82637899931ca678b12cde70c6309c983593599d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Canvas: Add a means to override the DPR used via an environment variableAndy Shaw2021-08-251-2/+9
| | | | | | | | | | | | | | | | | | | Overriding the DPR enables the system to not use as much memory and resources that a low-end device or mobile might have a limited amount of for rendering the Canvas item. In a situation where the user is aware of the consequences and impact of forcing the DPR to be different to the canvas window's DPR then this can be useful in those situations. By having the environment variable to override the DPR then it makes it possible for those needing this right away in all versions of Qt, so we add this now with a view to add API for this at a later date. Change-Id: Icafaa04a15678e2c7f24bc791026676f476a6ced Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit b0193908258f315a5736edcbc2a034d3194d42c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Binary compatibility files for 6.1Milla Pohjanheimo2021-08-254-0/+51267
| | | | | | | Binary compatibility files added Change-Id: Ib75c45280518b6fdcb944046dc70b6fd8713c400 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qquicktextinput: Clear pre-edit text after input method resetJarkko Koivikko2021-08-233-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | The QPlatformInputContext::reset() function does not allow any further input method events to be called. Therefore, clearing the pre-edit text is the sole responsibility of the text input control. This change modifies the QQuickTextInputPrivate::resetInputMethod() function and calls QQuickTextInputPrivate::cancelPreedit() instead of QInputMethod::reset() directly. The cancelPreedit() function will send a QInputMethodEvent which clears the IM state (in addition of calling QInputMethod::reset() function). Also, rename the QQuickTextInputPrivate::resetInputMethod() function to cancelInput, since it does not call inputMethod()->reset() directly. Fixes: QTBUG-95461 Change-Id: I6ab3b9dbe71956af72656e2a25a05d79603b34ea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> (cherry picked from commit b2103e33f490c96d0068d211c6f2d5b540ca407e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix regression in ListView/Flickable event deliveryJan Arve Sæther2021-08-203-1/+223
| | | | | | | | | | | | | | | | | | The regression was introduced with 2acb31641fc9c34d24ac29232cdfec The problem was that when we entered QQuickListViewPrivate::wantsPointerEvent(), the event was not localized to the QQuickFlickable when mouse filtering was done. Therefore, since the code assumed that the localPos was local to the Flickable, it always ended up assuming that the point was within the bounds of the header/footer. Fixes: QTBUG-89409 Change-Id: Ib595e61b7995241b58e3051da09139e1e1f13cba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit b2e4f09bfa2c42af562f6741c0a0246a53028f0a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-201-2/+2
| | | | | Change-Id: Id540300c007e9dfd65d1b509c743dbe322554f2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-181-2/+2
| | | | | Change-Id: I2ce72421b5d3d726f2fe3ed7025ea0dccf236bfc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Stop using QtGraphicalEffects in fakeFlickable manual testShawn Rutledge2021-08-171-9/+9
| | | | | | | | | | It's still MIA. Material style has its own implementation but we unfortunately aren't shipping any module with a reusable RectangularGlow. Change-Id: Ie14188c517ff31217e25dc428b400659e3d0613f Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 68171d9456d673ddaa9e68bbc2fbb4f3145dccf8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add tests of matrix4x4 transformation functionsYuya Nishihara2021-08-171-0/+54
| | | | | | | | | | | | These functions have been added at ded64d0368 "Make the qml/js matrix4x4 type more useful." Let's add some tests as I want to add another overload of rotate() function. Change-Id: I12e5970b8e3a6709e9f794c9713feb277cc8c449 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit b4866c499a6b2d1f42b77f08287988b01118c9f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Document matrix4x4 transformation functionsYuya Nishihara2021-08-171-0/+67
| | | | | | | | | | | These functions have been added at ded64d0368 "Make the qml/js matrix4x4 type more useful." Change-Id: Ia61eb5c7c058e2b94bb1b8b0e7bd56371feadca1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit d3b99595aee699dc4f01fb3658e0b33ba313f9f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Mark KeyNavigation's properties as attachedIvan Tkachenko2021-08-161-7/+7
| | | | | | | | Fixes: QTBUG-95811 Change-Id: I3bedef190b839bf5436d0cdd07d2011c237c03f2 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 88f38cbcb27566650109a97098a9cf2c19668fb0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-141-2/+2
| | | | | Change-Id: I4da7ef8b215d07308315f4b592e4135e938a6c29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-131-2/+2
| | | | | Change-Id: Ieae338513439d34605d05900c6f4cb6bd47ee146 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-131-2/+2
| | | | | Change-Id: I5d46d558391e7e1e3b7ac03f9887e033480b2c37 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: fix AnchorChanges typoJeremy Katz2021-08-131-1/+1
| | | | | | | Change-Id: I6e5cc9807ddc2ae6a40a864b3154fe93fcc32d69 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit a4a80e9a5c0452936241657c19ce871094a4f335) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Mark QQuickColorGroup as \internal in the documentationVolker Hilsheimer2021-08-121-0/+2
| | | | | | | | | | | This is an internal class that makes no sense without QQuickPalette, which is also an internal class (and already documented as such). Fixes: QTBUG-95591 Change-Id: I878d9bf9794530dfe57ba77db86c7ff9a9a02bd3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 419734ddda88950ad3f09f7c630eb8771f9f0144) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-121-2/+2
| | | | | Change-Id: I6df27b642bc600d2dda711c22058e16c238a65ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-091-2/+2
| | | | | Change-Id: Ifbb5191993d082083f830dcfb22cfc28a960ba89 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Add a TapHandler button snippetShawn Rutledge2021-08-062-0/+82
| | | | | | | | | | It was ironic that it's the most obvious use case of TapHandler but we didn't have some easy copy-and-paste code for making your own button. Change-Id: I680b6f828f0df82e2ab8b434a2e76aabb21fc2b9 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0fb1a49db192e7b0f0b0fe7ac441dead1608eb63) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Improve the Input Handlers index pageShawn Rutledge2021-08-063-17/+133
| | | | | | | | | | | | | | - Document the exclusive/passive grab concepts better - Mention gesturePolicy's impact on grab behavior in the TapHandler docs too - More links - Add a couple of snippets illustrating simple use cases with handlers - Don't bother mentioning Qt.labs.handlers anymore Task-number: QTBUG-68110 Change-Id: I5e6f538c2bc8cafef679f535a5248b218b4a8068 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit aade6857d12b2c9cd5552d25f4d084a5fcd25f7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-061-2/+2
| | | | | Change-Id: Icf950bb9e03259a74167480eea14356667e025e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-031-2/+2
| | | | | Change-Id: I7adfd07ae706aa3ba7781a0b0684cf8d0f6eb720 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QV4::Heap::GeneratorObject: remove unused memberFabian Kosmale2021-08-023-1/+23
| | | | | | | | | | | | | | The member was marked as a Pointer for the gc; however it was never used, and thus also left uninitialized. This could cause memory corruption or asserts during the gc's mark phase. Fixes: QTBUG-95417 Change-Id: Ide826c0284b6060de8689e6f0dc753011108dba9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit d36b480a956e2437888925aa8a1f5e3cb6c06ebd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Sync shadereffect materialType cleanup between renderloopsLaszlo Agocs2021-08-022-8/+8
| | | | | | | | | | | | | | | | | | | | Follow 05ec3315e2ae723cd32b1b49260f0d09ee1fa423 from 5.15. The windows render loop is gone in Qt 6, and there can only be one type of material type cache (no legacy OpenGL path). The same issue is present, however: the basic and threaded render loops behave differently when it comes to calling cleanupMaterialTypeCache(). Make the behavior identical and follow a uniform order (1. tear down the scene graph 2. then drop cached QSGMaterialTypes) Task-number: QTBUG-94844 Change-Id: I61f4962fe8ae1a359a22fbe72e40eb2525d81e03 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit aedb4853a509d63a599779fa5115083f84fad389) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-08-021-2/+2
| | | | | Change-Id: I93076185daf3b0f8c4cce6b9f3f939d7e24835b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-08-022-2/+2
| | | | Change-Id: Ie1d965b0f0f84f60a73882e5be8a6d9ce83f8727
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-07-301-2/+2
| | | | | Change-Id: I3a489ea16813719e36b1c661863d6855c67a78b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix QQuickPaintedItem performance and memory usageLaszlo Agocs2021-07-301-7/+5
| | | | | | | | | | | | | | Keep the existing QSGPainterTexture (QSGPlainTexture). This is what Qt 5 would do as well. Otherwise we silently get lots of unnecessary releasing and creating graphics resources underneath. Fixes: QTBUG-95132 Change-Id: I88e839793fedd8f2c6d00cd76cd9a653731865f4 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 146f8cbf865e0061859dd9f1c7a477db91298052) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-07-301-2/+2
| | | | | Change-Id: I08739a78ddc90e4ce6191b070a6d41f3758fb81c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: add example snippets for containmentMaskMitch Curtis2021-07-275-4/+171
| | | | | | | | | | | | This shows how to use non-rectangular shapes for hit tests, as well as how to define the contains function in QML. Task-number: QTBUG-89380 Change-Id: I93c686d840b292816a788c05a0a76fafa338d5f8 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 382d2bfe5f261c269ccf4b970c826003c90d57ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pass the focus reason through to the control on mouse pressVolker Hilsheimer2021-07-234-5/+124
| | | | | | | | | | | | | | | | | | Otherwise, a TextInput item will always receive OtherFocusReason when clicking into it. Add a test that simulates focus changes with mouse and keys, records the incoming focus events and verifies the correct focus reason is set in the event. Qt Quick provides no mechanism to access the focus reason from within QML (onActiveFocusChange only has a bool parameter, the focusReason property exists only in QtQuickControl). Task-number: QTBUG-75862 Change-Id: Ifea95c7ef2ac88c6c8e8bbdc8d2dbe5205ff922e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit bbcbb7c78f2f07e6c5e380ec5c018ac2a7abf292) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update QQuickImage's DPR if re-loading the image didn'tVolker Hilsheimer2021-07-231-2/+6
| | | | | | | | | | | | | | | An SVG doesn't have a DPR, but we need to reload and repaint it anyway when the DPR of the screen changes. So store the DPR of the item explicitly if reloading it didn't change the value (for instance, because sourceSize was not set). Otherwise, DPR changes are only handled when moving from a 1.0 (the default) DPR display to a different display, but not when moving back. Fixes: QTBUG-94622 Change-Id: I9f0a847699ab027ef876e341b8c6a954a6167ab3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 08838f434b55024d9d5a9252fc2a3fb782b087da) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: I63140288f1fa88711f7478e840182fdc8eb4e8f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I35a12dd9c634e973e84a59cb09d6551d8e89e2ae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: Iceca18395dc475de09c8c9cbb40a1da5af13769d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Avoid infinite loop in designer supportThomas Hartmann2021-07-225-7/+88
| | | | | | | | Task-number: QTBUG-94928 Change-Id: I1ee14600fb0fd9f0ee499546e3ffcd66114aaeff Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> (cherry picked from commit d3cae36550fe8b82c641cef6a207e991a9064d85) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle QScreen::physicalDotsPerInchChanged changes for the initial screenVolker Hilsheimer2021-07-211-3/+9
| | | | | | | | | | | | | | | We connect to the signal when the screens change (in QQuickWindow::handleScreenChanged), but never for the initial screen. Not connecting means that changing the DPR of the initial screen doesn't re-render QQuickItems with the new DPR, which was in particular visible for QQuickImage when displaying SVGs. Task-number: QTBUG-94622 Change-Id: I44ff3f8f3713d5a7bba8b6b8b4d5ca14530fe373 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 7e39a2204382a78ac6ff1e32dfe29dcbce65004c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adjust import documentation to mention that versions are optionalFabian Kosmale2021-07-212-15/+24
| | | | | | | | | | | This change also removes the versions from the import statements. Task-number: QTBUG-95302 Change-Id: Ie29e57a618917977b46dff25d13e3ca3eff249b5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 58783a4f9d411e4bc0fc45bd5da9164e3313f0a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-08 06:17:59 +0000