aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7.0' in qt/qtdeclarativev6.7.06.7.0Qt Submodule Update Bot2024-03-221-5/+5
| | | | | Change-Id: I97095dbb3d56b1a89c8128bd9e83b44438afcd50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtdeclarativeQt Submodule Update Bot2024-03-201-5/+5
| | | | | Change-Id: I5e5daa6d6ea0662628d100a8a1fdd954c59f56a4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove revisioning of shadowed x/y properties in QQuickWindowQmlImplTor Arne Vestbø2024-03-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | The properties are available in QWindow as well, and our property resolving doesn't consider properties in base classes when a revision excludes a property in a sublcass from being picked up. Currently, clients who import QtQuick 2.1, and hence bring in QQuickWindowQmlImpl instead of just QQuickWindow as the Window type, will get: "Window.y" is not available in QtQuick 2.1. The workaround is to either import QtQuick 2.0, or remove the version from the import. This is a partial revert of 0fdca3e40d9afed9bc745a902a7fce6329d0e2b4 Pick-to: 6.7 dev Change-Id: I34346627e5ae12a40ddd298eea9a9e1bbc89d815 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Android: fix install path of Qt6AndroidQuick.jarAssam Boudjelthia2024-03-201-1/+3
| | | | | | | | | Fixes: QTBUG-123332 Change-Id: I013df5a7e1db6bb06cb0efa85c73844e97e1bde5 Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io> (cherry picked from commit 11843cc125f5505fbec28392884ebd87eb607bba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 139b13f15a987ee9947fe16ac76131f0f3d33119)
* Update dependencies on '6.7.0' in qt/qtdeclarativev6.7.0-rc2Qt Submodule Update Bot2024-03-191-5/+5
| | | | | Change-Id: Ie6a34d9cf06d69d4d2ecd0fa674471ffc36b718c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Controls Text Editor example and docsShawn Rutledge2024-03-196-84/+173
| | | | | | | | | | | | | | | | | a27b75c89da31a9ed1cf6dc6f6d3f3514ad28f8e doesn't work in its entirety on 6.7 branch; but this patch applies the parts that are possible. These docs have been adapted from the version in 6217408799c43869b8a7c1fcbff882d42ae71171. We update the html and markdown example files. We also move ScrollBar to make explanation easier. Change-Id: If65de335f840382b5e236d8a04db382b0b7aee6a Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 6217408799c43869b8a7c1fcbff882d42ae71171) (cherry picked from commit 3b44a457efcf42f4f6b3ce0d6ae41ef3821e4478) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtdeclarativeQt Submodule Update Bot2024-03-181-5/+5
| | | | | Change-Id: If9dd60312aa2d4fbc9c6d398a832c55ab14301d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Handle more potential underlying typesFabian Kosmale2024-03-185-0/+107
| | | | | | | | | | | | | | | | | | Since f3bcbfd6a50fb7e74f4ff6714d3b3066fa74e253, we use the underlying type of an enum when the binding is detected as a resolved enum and the property is of enum type. When using an enums underlying type, we can receive types that were formerly not possible, because we would normalize them to plain int. Fix this by teaching the object creator to handle assignments of signed and unsigned integer types. Fixes: QTBUG-123428 Change-Id: I3635b7de048e0c6ddf79381679aafee89a5b3def Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 186405955f1057111379369fc43951513c461aa9) Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Update dependencies on '6.7.0' in qt/qtdeclarativeQt Submodule Update Bot2024-03-181-5/+5
| | | | | Change-Id: Ib18693f3b88c43d6a0e685fdd47b323f5ef8488b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: Fix missing qqmlengine.h includeSoheil Armin2024-03-151-0/+1
| | | | | | | | | | | | | Add missing qqmlengine.h include in qandroidquickviewembedding.cpp as it may QQmlEngine may resolve to a forward declaration, resulting a compile-time incomplete type error. Fixes: QTBUG-123307 Change-Id: Ieb6e20f0a096450300cec267e6b1ab4671c037bc Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6667dd4b4066343084cc3d7d2ff80327c6c389f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 92aab1cd34d2b0a5c428d0007d8a99a73bbfb858)
* Fix enum class lookup on SingletonsFabian Kosmale2024-03-155-2/+55
| | | | | | | | | | | | | | | | | | | | | When we consolidated the code for looking up enums in QQmlType, we exposed ourselves to a bug in initEnums: Not only CppType should be affected by the logic for registering unscoped enums, but also C++ singletons (SingletonType). Amends 4ceb343e7f006972940b6880f974770c02fa6b87 and 4e69f2468ad599b7175f60e08341d37689512c9c. Fix this by consulting the meatobject, if there is one. Ideally, this should probably stored in the QQmlType at type registration time, but that can be cleaned up at a later point. Fixes: QTBUG-123225 Task-number: QTBUG-123294 Change-Id: I7b09459ce4035acb2566b9550fa844897b1b363a Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit 9d19d7e6e3bc28a0a62cebb01a0a562b1c13d12f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 4fccb4b590301a2d97b55d0448cd753230a4b34e)
* fix crash in qquickspinbox.cppTim Jenssen2024-03-142-1/+7
| | | | | | | | | | | | | With a custom style, the validator might not be set initially or at all. Task-number: QTBUG-123160 Change-Id: Idd4b801e75737fa2cfac112d06f9f7ad04278c26 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 6e853af5b97d71d0cffa978a2bf502083c222348) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e68b9dc5882382169225f6f409e510a4f52dd6d7)
* Android: Add documentation for QtQuickView classNicholas Bennett2024-03-135-1/+269
| | | | | | | | | | | | | | Added Android classes page, since this is a Java class, qdoc doesn't know how to generate its docs automatically, so a custom layout is created manually here. Updated the qdoconf file to include the QtQuickView source folder. Task-number: QTBUG-120718 Change-Id: I5e4bc112536b63fae1c79d0035f2d742d0c7c2da Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 7318e939c57c5904517ff7f2563285d7a7fddd67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 289112fc1a5da91da456721839f950cba371b32b)
* Keep markup when toggling TextEdit.format: AutoText / PlainTextShawn Rutledge2024-03-122-42/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when writing an editor that allows you to do wysiwyg editing or raw HTML/markdown. Usually you want `format: AutoText` because you don't know what the user is going to load, and we expect QQuickTextDocumentPrivate::load() to find the type from the URL extension (since b46d6a75ac16089de1a29c773e7594a82ffea13e). Then if the user toggles format to PlainText, that's assumed to be for the purpose of raw viewing or editing, not for the purpose of removing the formatting. (Switching to plain text can be accomplished by `textEdit.text = textEdit.getText(0, textEdit.length)` .) We adjust tst_qquicktextdocument::overrideTextFormat() slightly: loading an html document as AutoText and then converting to HTML no longer emits the textChanged signal (it's not really a conversion). Likewise, converting markdown loaded as AutoText to explicit markdown should not need to emit the textChanged signal. Amends fdbacf2d5c0a04925bcb3aecd7bf47da5fb69227 Done-with: Oliver Eftevaag <oliver.eftevaag@qt.io> Fixes: QTBUG-122985 Task-number: QTBUG-120772 Change-Id: I1d43b5e5662197dfeb1a93a2d1f638a193aa66b2 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit bc1bdd0e15ad1fbc1ffb2af666b0ca5676858ee0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 206a1fa2a4c1f04421cc2a80c4f3e329495d9d38) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Android: Add docs to QtQuickView classSoheil Armin2024-03-111-2/+144
| | | | | | | | | | | | | Add descriptions to public methods and interfaces of the QtQuickView. Task-number: QTBUG-120718 Change-Id: Ieffbd6b69be1cb4fe41839793343cac6a02229bd Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit e05ccb11db464df76640766f42b13f1d15f07ae9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 337d721a215639fbddef3685fb0b88192c9e5a98)
* Update dependencies on '6.7.0' in qt/qtdeclarativev6.7.0-rc1Qt Submodule Update Bot2024-03-081-5/+5
| | | | | Change-Id: I2c29e9782074399a84c458e4b3a964d3ab7afa1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickAttachedPropertyPropagator: fix child window propagationMitch Curtis2024-03-082-21/+66
| | | | | | | | | | | | | | After the recent changes to window code, a child window's transient parent is not available as early as it used to be. Account for this by listening to changes in the window's parent as we do for items. Fixes: QTBUG-122008 Change-Id: I2cd93e3c487e7ce4567e740886ef65a756c1350f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 5f7b25a694eb46cc520b6dd2651f1e3f99e310f0) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9ca9468ffd464c9b131dfe2f7170c34a2d1413c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Rename add/remove... to connect/disconnectSignalListener()Soheil Armin2024-03-081-2/+2
| | | | | | | | | | | | | | As the SignalListener can potencially connect to multiple signals, and the QtQuickView does not take the ownership of the SignalListener, connect & disconnect can better explain the functionality if these methods. Task-number: QTBUG-119751 Change-Id: I78f44a0ee72f746d20b48fbae15fc8ea770609e8 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 29417cbe4dbc79a35c356303ae0a8c3dec568c03) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3263b0f4de131520d2ba719eea12a09408c41a34)
* QtQml: Make QLocale an actual value typeUlf Hermann2024-03-0713-477/+360
| | | | | | | | | | | | | | | | | | | | | | | We want to be accessible to qmllint and other QML tooling. To this end, make all legal invocations of its methods properly typed invokables. Keep two QQmlV4Function overloads to produce error messages if the methods are called with the wrong parameters. We have to do this because JavaScript is more liberal in its argument coercion than the methods would like. Un-deprecate QJSNumberCoercion::isInteger() since it's actually quite practical here. Fixes: QTBUG-112366 Change-Id: I016e5edc47efaade44461c504c1b3e2b1b829b58 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ccbfa4458357a1c49b6c192b96ef9440cdbaf397) Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> (cherry picked from commit 69fc1b5621db7eb962b8cb6a4d11df3a97b987b9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix broken linkVenugopal Shivashankar2024-03-074-13/+12
| | | | | | | | | | | | | | | | | Fixed the following qdoc warnings: - src/quick/items/qquickitem.cpp:[7966,7974]: (qdoc) warning: Can't link to 'QQuickControl' - src/quick/items/context2d/qquickcontext2d.cpp:3412: (qdoc) warning: Undocumented parameter 'imageData' in Context2D::createImageData() - src/quick/items/qquicktableview.cpp:1230: (qdoc) warning: Undocumented parameter 'cell' in TableView::modelIndex() - examples/quick/quickshapes/weatherforecast/doc/src/weatherforecast.qdoc:[13,21,27,45,78,83,93,102,105]: (qdoc) warning: Can't link to 'Qt Quick Shapes' Fixes: QTBUG-122230 Change-Id: I4f533ed95c13a99d649568d7b773437712b5b2d1 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit cb714b1f749389f9fd4dcf2ad53056f99dd3c3a1) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 7ed4fa0a5fd79afafab3ced20545e384595cee73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qtdeclarativeQt Submodule Update Bot2024-03-071-5/+5
| | | | | Change-Id: I04f88a020a727eedac577b5abe4e5fa4c3ea125c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickWidget: Play nice with Vulkan and offscreen grabbingLaszlo Agocs2024-03-061-1/+7
| | | | | | | | | | | | | | | | | | The texture does not have the UsedAsTransferSource flag set. With Vulkan this results in a validation layer warning (if that is enabled) when issuing the VkImage -> buffer copy during the grab. Add the flag. We also need to ensure there is a QVulkanInstance (VkInstance). Normally we do not care about this and just forward what the toplevel/backingstore use, but this is not there when trying to grab with a not-yet-shown widget. Use the helper singleton (QVulkanDefaultInstance) to get a QVulkanInstance. (this is also what the backingstore and Qt Quick uses) Change-Id: I9f5b4a67a1a7862e6b89e76f2a6d55c8a2be1972 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit b676c3fbc7117fbf0b3580c16a1173f9c383d54c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update test cases for change in default size policySanthosh Kumar2024-03-062-5/+116
| | | | | | | | | | | The size policy of items updated as part of task QTBUG-117597. This patch adds an autotest for default size policies. Task-number: QTBUG-117597 Change-Id: Ibc84b2d462885d1d31313040905e74e5bb072373 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit ef30b93682d7f82d6cbe03fb32cb775c99a26910) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickRhiItem: fix access specifiers of overridesMarc Mutz2024-03-061-2/+3
| | | | | | | | | | | | | | | | | | Overrides should not change the access specifier of the original virtual method, because accessibility of the function should not change depending on which concrete static type it's called on. QQuickItem::isTextureProvider() and ::textureProvider() are public, so the QQuickRhiItem overrides have to be public, too. Found in API-review. Change-Id: I4a9d4b8cd479eb8361a5b57e0fdd7ce3fdbbabcd Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 95f77de0d45c6fba3465acf7b632e41cf10ed60d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Baseline scenegraph test: avoid rendering blacklisted itemsEirik Aavitsland2024-03-061-0/+6
| | | | | | | | | | | | Employ the new functionality in the baseline framework that facilitates skipping blacklisted items prior to rendering. Useful if rendering certain scenes cause crashes on some platforms. Pick-to: 6.5 6.2 Change-Id: I9f545751bff66eac548fdac8212f0ade4df7b6de Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 4ca19bab7eeaa3734a315db236d493e936002be5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Clarify that automatic transient parent relies on visual parentTor Arne Vestbø2024-03-062-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of 16023fc77c423a267fcc48894ff942e94cf35b86, the behavior of declaratively and imperatively setting the visible property of a window was made consistent, which is an important property of QML. Both methods now respect the presence of an Item or Window parent for the Window, and resolve a possible transient parent from the parent Item or Window. The transient parent magic behavior is active as long as the transientParent property is not set by the user explicitly. Seeing as transient child windows should not be shown before their transient parent windows, this means that as long as we can possibly have a transient parent, we don't show the window. And since an Item may not initially be part of a scene, it may not have an initial window, and we have to wait to show the child window. What this means is that an Item parent hierarchy of a Window needs to be in a scene, so that the direct Item parent of a Window gets a window, which we can then use to determine whether to show the transient child window or not. This matches the behavior of an Item added as a property to another item. It will not be rendered until it's included in the scene by setting the visual parent of the item to some item that's in the scene. [ChangeLog][QtQuick][Window] Windows that automatically pick up a transient parent window from its Item parent will not be shown unless the item is part of a scene. Fixes: QTBUG-121197 Change-Id: Iae050cd5f0a4e11ef9c397494dac9bbac8d00cdd Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6db942a87db172f6d707afa0bfaf1278cb5db965) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Export QQuadPath::Element for private APIMatthias Rauter2024-03-061-1/+1
| | | | | | | | | | | This is required to make non-inlined member functions callable and linkable from outside the library. Change-Id: I1a705b87edfc4b5fa681739bcf0a41954b9d1f11 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit bcc99ae1decf65e06df3693591e0ab2fad578fcc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_QQuickTextDocument::overrideTextFormat() remove failing data setAxel Spoerl2024-03-061-5/+0
| | | | | | | | | | | | | | | | | | | | | The dataset "load html as autotext, switch to plain, back to auto" caused permanent failures, because plain text escapes the <DOCTYPE> header text and formatting tags, to mark them as metadata. While the conversion back to HTML works, the conversion to autotext keeps the escaping made in plain text. A behavioral change would be necessary, to amend the conversion logic. With the currently implemented logic, the specific test is bound to fail. Remove the test data set, to unblock submodule updates. Revisit the issue at a later point. Fixes: QTBUG-123014 Change-Id: I0c5f461f17c4388dbd49796134e168a7afa0dd35 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit b690491a5d3786c16421eb90aa4b4d627bff16c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qqmllsutils: fix fallthrough warning, take 2Sami Shalayel2024-03-061-0/+1
| | | | | | | | Add a missing break statement to silence a compiler warning. Change-Id: I9b760700a9d9febbf8bc29f0323a09cb2fe73e81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
* doc: Remove statements that horizontal rules are not renderedShawn Rutledge2024-03-062-2/+0
| | | | | | | | | | | They've been rendered since eca6bd485436f9ddf16036b98c993b7ffeb7e6c4 Pick-to: 6.6 6.5 Task-number: QTBUG-74342 Change-Id: Ifabe3d38ab7121145b76653faee324f4c656def1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 9b39b0301dcc922b9525bcfeaa98fbc51e1174f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Unblacklist tst_QQuickPopup::focusMultiplePopupMitch Curtis2024-03-061-3/+0
| | | | | | | | | | | | This partially reverts 87d61c4fe35aa115018a28f1bdd8d5c2beca6fe6 . It hasn't been flaky since 2023/12/09. Task-number: QTBUG-118058 Change-Id: I97c3d63f5b496e589f0c702e2985ffc10257ea0b Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit f31788cb0e0cfe1ac666bcfe465d65ee1cfc64f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Blacklist tst_qquickpixmapcache::slowDevice on all platformsMitch Curtis2024-03-051-1/+1
| | | | | | | | | | | It's not just flaky on opensuse-leap. Task-number: QTBUG-118064 Change-Id: I9b23b2c15ff445bdf0eb963499537fbfcfbf6234 Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 7dcac192cdc21278ddfa018dc69b02e8f66049dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use Qt::AA_QtQuickUseDefaultSizePolicy to apply size policy for layoutSanthosh Kumar2024-03-052-10/+38
| | | | | | | | | | | | | | The default size policy that need to be applied for quick items within the layout has been changed as opt-in. This further require layout to consider Qt::AA_QtQuickUseDefaultSizePolicy attribute and the same been tested for set before applying those size policies. Task-number: QTBUG-117597 Change-Id: Idbd27f8cd1ffbfe7631e953c787234f9f1e5b0e2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit b60b1e17a2d0dc6f263dc0c788f0a6bf14e6d0de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Follow QQuickRhiItem property rename in exampleLaszlo Agocs2024-03-051-1/+1
| | | | | | | | | The example was not updated. Change-Id: Ib9afde58b3f48639cf77848e36ee503df78bdd53 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c00e6b1c40f5cfa4c0183429e7972153e96da919) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use scoped enum for format in rhitextureitem exampleLaszlo Agocs2024-03-051-4/+4
| | | | | | | Change-Id: I2add2eb838cf7087902fbb264cef5e849435ab6e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 2f3bf5f515fea9738b3bdef318de86a6e313b918) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-03-051-5/+5
| | | | | Change-Id: I020567378925590e5b09c63164dbf8e5a5116175 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickPopup: always run exit transition on hiding a popupVladimir Belyavsky2024-03-042-6/+38
| | | | | | | | | | | | | | | | Amends c16dc16cafa78ea2a3d1ef6e374f46d6632da779. Do actually what the comment said "Do not start EnterTransition for a popup in QQuickPopup::setVisible() when the popup is not yet associated with any window" but do _not_ touch original ExitTransition logic. Fixes: QTBUG-122915 Pick-to: 6.6 Change-Id: I77db41254d1c1966f4b3b5285e26efd0487da51b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 30ae9e99e275d9c2288a14120b36f763a9d88c78) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickWidget: don't set WA_AcceptTouchEvents on macOSShawn Rutledge2024-03-042-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Usually, a QTouchEvent comes from a touchscreen, and we want those touch events in Qt Quick. But on macOS, there are no touchscreens, and WA_AcceptTouchEvents has a different meaning: since qtbase 03d057ff01332333b98f5298c3d0bd85b5604ac9, QApplication::notify() calls the native-integration function registertouchwindow() to change NSView::allowedTouchTypes to include NSTouchTypeMaskIndirect when the trackpad cursor enters the window, and removes that mask when the cursor exits. In other words, WA_AcceptTouchEvents enables getting discrete touchpoints from the trackpad. We rather prefer to get mouse, wheel and native gesture events from the trackpad (because those provide more of a "native feel"). The only exception is for MultiPointTouchArea, and it takes care of that for itself. So don't automatically set WA_AcceptTouchEvents on macOS. The user can still do it, but we don't recommend it. Amends dc8f44b14501ecd4acc196f5138aeff3f7502d0a Fixes: QTBUG-113384 Pick-to: 6.6 6.5 6.2 Change-Id: I8b0e1d247adfc95f1c9a0881a6020eab1a42b0ab Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 2f1be4c51a1655697933468c10ba53316306d207) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash when item is deleted in event handlerPaul Olav Tvete2024-03-042-1/+39
| | | | | | | | | | | | | | QQuickDeliveryAgentPrivate::deliverPressOrReleaseEvent() creates a list of possible targets and iterates over it. This would cause a read of deleted memory if delivery to one target would cause another item in the list to be deleted. Fixes: QTBUG-91272 Pick-to: 6.6 6.5 Change-Id: I3f648e683d9b441ee0f14e4f721338ac59ace3cc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 10536ea75063210e78563e35e4ad3a755b172530) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickEvents: add revision to 6.7Semih Yavuz2024-03-041-4/+4
| | | | | | | | | | | QQuickEvents were anonymous before 6.7, so this is a safe change, as it could not be referred by name before. We need to mark it as new in 6.7, as otherwise it might clash with other names. Pick-to: dev Change-Id: Ia7c77c683fac0fcd12ba52d44d8ea8d0fd48e79f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QQuickTextDocument: add revision to 6.7Semih Yavuz2024-03-041-1/+1
| | | | | | | | | | | QQuickTextDocument was anonymous before 6.7, so this is a safe change, as it could not be referred by name before. We need to mark it as new in 6.7, as otherwise it might clash with other names. Pick-to: dev Change-Id: Idf44e50978c64d7e04d7ca3886b1d8d0654ecdbe Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Silence -Wimplicit-fallthrough for clangTim Blechmann2024-03-037-0/+7
| | | | | | | | | | Unlike gcc, clang warns about implicit fallthrough even if the following label only contains a `break` statement Change-Id: If7fb15b5e2e1a8fb80668087e4497efb8d3d30d4 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> (cherry picked from commit f373e6407424bc23f0327b82a0b500d120339632) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-03-031-5/+5
| | | | | Change-Id: I00d190794a5c867d986919df5ad9068d11d55607 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing revisions for new 6.7 APIsVolker Hilsheimer2024-03-026-14/+17
| | | | | | | | | Task-number: QTBUG-119952 Change-Id: Id04ba05d551ffd487fd61c5a6222b33883b684e1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 0fdca3e40d9afed9bc745a902a7fce6329d0e2b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix spelling of FFmpeg in (end-)user-visible stringsVolker Hilsheimer2024-03-021-2/+2
| | | | | | | | | | | It's two capital "FF", lowercase "mpeg". Pick-to: 6.6 6.5 Change-Id: Icc379d0a680612b612ee306be7749697906bf4c3 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit d0823fb78b2e0ab5b31021912806148c47dd29f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash on exit when pause animation is runningPaul Olav Tvete2024-03-021-3/+5
| | | | | | | | | | | | | | | | | | | | At program exit, QThreadStorage will delete the QQmlAnimationTimer. In the destructor, any currently active animation job will be unregistered. The animation timer has a list of all top-level animations, and a list of running pause animations. A pause animation that is a child of a group (the normal case) would not be removed from the list when its parent was removed. This caused a read-after-free when the animation timer tried to update the deleted pause animation. To fix this, make sure that pause animations are removed from the list also when the parent is unregistered. Fixes: QTBUG-120433 Pick-to: 6.6 6.5 Change-Id: Ic6b5a8f09593114c50daf5525824cc814abb79f9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6e7fa22d4599484746c91b3e0f5fe2c3332a11e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-03-011-5/+5
| | | | | Change-Id: I402cfcc1547b878e301c25f2c8728aac9fd21112 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Adapt layouts to take advantage of new size policy information"Jan Arve Sæther2024-03-013-39/+10
| | | | | | | | | | | | | This reverts commit e5354850b8cee965d6925da29a73b2aa19ccae55. Reason for revert: This is needed in order to rename AA_QtQuickDontUseDefaultSizePolicy to AA_QtQuickUseDefaultSizePolicy in qtbase Change-Id: Id787f6fd42cf2115e24ceb8c30aa01badf183fac Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-03-011-5/+5
| | | | | Change-Id: I20e3b715e6e0dcb1a10d4ee428b0d60243e74155 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use showView in tst_qquicktextedit::mouseSelectionModeShawn Rutledge2024-02-291-12/+8
| | | | | | | | | | | | | Not sure if this will have an impact on stability, but we have showView to standardize some boilerplate that was otherwise duplicated here. Pick-to: 6.6 6.5 Task-number: QTBUG-78846 Change-Id: Ic0faec8b11d162fac49bd6679c0652e9760238be Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 2878c935b1d65ae71f8947c57319b8f547dbd43f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 05:45:54 +0000