summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Exclude `qmldomlib` from Unity BuildAmir Masoud Abdol2023-04-171-0/+1
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ic6e8ff63120a207cc2b40fc55f15753e378f466f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* ScrollView: replace "content" bool with enumMitch Curtis2023-04-171-13/+18
| | | | | | | | This makes the code clearer than just passing true or false everywhere. Change-Id: I975c69080681db4ee7e9cc3b8a5509ef118348cd Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
* Fix visibility of scroll bars in ScrollViewMitch Curtis2023-04-174-10/+56
| | | | | | | | | | | | | | | | | | When imperatively assigning a contentItem, we need to make sure that we respect the policy of the scroll bars, otherwise they could end up visible when they shouldn't be, and vice versa. This patch also sets the ScrollView as the parent item of the contentItem, as a ListView assigned imperatively may already have a parent item, and so setContentItem_helper will not set one. When setting the parent item, we also need to ensure that the stacking order is correct, otherwise the scroll bars will be behind the contentItem and can't be interacted with. Task-number: QTBUG-106118 Pick-to: 6.2 6.5 Change-Id: I88d342282ea6d202cbe0f776a6bf4fb1f9cadc48 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
* QmlCompiler: Merge bool and any pointer type into the pointer typeUlf Hermann2023-04-151-2/+2
| | | | | | | | | A pointer type can hold bool as either nullptr or some value. We don't need to produce a QVariant for that. Change-Id: I368c3fa703d08ff396a5b4702ba7d1f2614b1467 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* XHR: Add responseURLTasuku Suzuki2023-04-152-0/+34
| | | | | | | | | | | https://xhr.spec.whatwg.org/#the-responseurl-attribute the attribute was introduced around 2014. [ChangeLog][Qml][XMLHttpRequest] Added missing responseURL property. This returns the url that was used to retrieve the response data, after any redirects have occurred. Change-Id: Ice70520913bb306885a10dfd7a3a89da31bcfdeb Task-number: QTBUG-111217 Reviewed-by: Lars Knoll <lars@knoll.priv.no>
* MultiTouchArea: only subscribe to hover events when enabledVolker Hilsheimer2023-04-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | On macOS we always subscribe to hover events in the constructor so that we can enable touch event handling when the mouse enters the area. However, a disabled item should not accept hover events, so we also need to override itemChange so that hover-acceptance is flipped based on the enabled state. Items should also never accept hover events, they should always propagate. As the events are accepted by default and ignored in the default event handler implementation in QQuickItem, we need to ignore explicitly when we override. Do that by calling the parent class implementation explicitly. A disabled MultiPointTouchArea should also not subscribe to touch events, even when the mouse enters. Fixes: QTBUG-107037 Pick-to: 6.5 Change-Id: Ifa57cb2af4fbf11a0c8eacde87d80e60afa3f895 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QQmlSA: Remove dead codeFabian Kosmale2023-04-141-1/+0
| | | | | Change-Id: Iec9f607ead6ee32cc9bb1d40c5cd9967e86c7772 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Fix stack layout index when loaded asynchronouslySanthosh Kumar2023-04-141-0/+5
| | | | | | | | | | | | | | | Lazy loading of stack layout causes incorrect index value in the attached property for the child items. This is because, attachedProperties are created and updated for the child object, after being added to the stack layout. This patchset triggers childItemsChanged() to reset child objects of stack layout with right index value. Fixes: QTBUG-111902 Pick-to: 6.4 6.5 Change-Id: Iad06d028d0f977189b5da1122904dc754060a609 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* quicktemplates: include missing headersTim Blechmann2023-04-141-0/+2
| | | | | | | | compile fix with clang++/libstdc++: unique_ptr requires <memory> Pick-to: 6.5 Change-Id: Ib01f660b6b43ee1eb5d729fbbd7b064cdfd22e9b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Use correct names for QEventPoint::State, PointerDevice::GrabTransitionShawn Rutledge2023-04-145-24/+88
| | | | | | | | | | | | | | | | | | | | | | | | | Qt::TouchPointState is not the actual type here, and we should not encourage e.g. making a comparison between eventPoint.state and Qt.TouchPointMoved in an onGrabChanged handler. The equivalence is an internal detail; and eventPoint can come from any pointing device, not only from a touchscreen. QEventPoint is a Q_GADGET; we keep the registration to expose it as a value type (eventPoint). But such types cannot be created in QML, and we also need to give it an uppercase name to scope the enum values that it declares: that's a new foreign namespace called EventPoint. So it's possible to compare an eventPoint instance's state property against EventPoint.Pressed, and so on. Also show complete QML syntax in the \value tables where PointerDevice::GrabTransition is emitted to QML, namely PointerDevice::grabChanged and PointerHandler::grabChanged. Amends b43a873264d012dc0a0e574ea53335a40af8aa38 Task-number: QTBUG-102160 Change-Id: If1a97f21d8e005e3692298b8512f7f8b56a92c97 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Place the QT_END_NAMESPACE in the right placeAmir Masoud Abdol2023-04-131-2/+2
| | | | | | | | | Moving the QT_END_NAMESPACE before the #endif of the include guard. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ia6b17c8c5b54840b84629b58e35f530dd09433d4 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QQmlScriptString: Avoid allocation in default constructed stateFabian Kosmale2023-04-131-9/+11
| | | | | | | | | | Classes like QQuickAnchorSetPrivate have multiple script string properties, most of them being unused. Avoid allocating memory in that case by simply letting the d pointer be null, and adding null-checks in the various accessor methods. Change-Id: I4b7a1298c4a5892028174b82c3a92ccd93bdf65e Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Fix build with -no-feature-listview and itemviewsTasuku Suzuki2023-04-1310-21/+63
| | | | | | | | | | | | | tested with each/all of below -no-feature-gridview -no-feature-listview -no-feature-pathview -no-feature-tableview -no-feature-treeview Pick-to: 6.5 Change-Id: I90cc7bc45bb9065000bc0fc7eeb8e80f02acb0d0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Material: add support for elevation to PageFabio Falsini2023-04-121-0/+6
| | | | | | | | Since Page control is supposed to be a derivate of Pane it should support Material.elevation too Change-Id: I05ad88d1fa9756456ac1672e40551200622bf120 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQmlDomAstCreator: split into header and implementation and renameSami Shalayel2023-04-128-914/+968
| | | | | | | | | | Split QmlDomAstCreator into an implementation and a header and rename it to QQmlDomAstCreator. Task-number: QTBUG-92876 Change-Id: I52a082d44f37e4fb111a5ca3e60704a02814d0d9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* qmlformat: change comment handling behaviorSemih Yavuz2023-04-122-11/+23
| | | | | | | | | | | | | | | | | | | | | | Cumulative commit for adding zero-length comments in qmljsengine and also handling of empty lines after comments. qmljsengine only adds comments if the relavant comment length is larger than 0. Allow adding zero length comments since empty comments might be useful and required in some situations. Unlike the other formatting tools (clang-format, rustfmt) qmlformat didnt respect the emptylines after comments and stick the comments to the associated element. Change this behavior such that a newline/ blankline is added(but no more than one). A few tests in qmldom/reformatter needed to be edited due to this new behavior. Pick-to: 6.5 Fixes: QTBUG-111231 Change-Id: I2fcdda0bfe569b7a1d19c4058e1604cb0d73291d Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Doc: Fix Material.containerStyle constant descriptionsAndreas Eliasson2023-04-121-3/+3
| | | | | | | | | | | The current header and descriptions seem to have been copied from the above Material.roundedScale section, but they don't make sense for the Material.containerStyle section. Fixes: QTBUG-112672 Pick-to: 6.5 Change-Id: I6ffb9d30cf4ff7a1d0a72888f804d1d92da1ecb2 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
* tst_QQuickTextInput: Stabilize clipboard related functions on XCBAxel Spoerl2023-04-121-1/+13
| | | | | | | | | | | | | | | | | | Even if compiled with QT_CONFIG(clipboard), a functional clipboard might not be available on XCB (e.g. due to restrictions on CI VMs). This patch adds an explicit test for XCB to platformquirks_p.h. It skips the test functions canPaste() and canPasteEmpty(). As a drive-by it constifies local variables in canPaste() and middleClickPaste() and unifies the skip message. It also removes the BLACKLIST entries for clipboard-related tests on opensuse. Fixes: QTBUG-95940 Pick-to: 6.5 Change-Id: If6da9b589e98c1f63435f3d444567ce310ddee8a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Dom: add static_assert for ElementTSami Shalayel2023-04-121-0/+32
| | | | | | | | | | Add a static_assert that prints a more understandable error message when invalid types are added to the ElementT-variant. Without this assert, compilation fails in mostly unrelated std::visit()-calls. Change-Id: Idef6b471c6d2d26d91b71350bb4577d012a40860 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Dom: cosmetic fixesSami Shalayel2023-04-125-23/+59
| | | | | | | | | Rewrite a comment such that it is readable again (I think it got messed around by clang-format), add a using declaration for filter-function in DomItem and some white space changes by clang-format. Change-Id: I8964b4e2b08ee4fb972bc4eac572ba6c7050dcc5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Dom: add QQmlJSScope to QmlObjectSami Shalayel2023-04-1210-16/+293
| | | | | | | | | | | | | | | | | | | | | | | | | Add a flag that allows to construct the Dom with the QQmlJSScopes obtained by semantic analysis. Added a new AST visitor called QQmlDomAstCreatorWithQQmlJSScope. This visitor synchronizes the qqmldomastcreator and the qqmljsimportvisitor to construct the Dom and the QQmlJSScope from the AST at the same time. It mainly does keeping track which subvisitor (dom creator or scope creator) is active, as one subvisitor may visit AST nodes that the other does not. Using both visitors at the same time allows to insert the newly-generated QQmlJSScope::Ptr directly into the correct Dom structure. The actual implementation of QQmlDomAstCreatorWithQQmlJSScope is in its visitT and endVisitT methods. Both are called in the AST-visitor-overloads. Added a benchmark on two big generated qml files to see how fast/slow does the qqmljsccope semantic analysis runs, compared to the QmlDom creation runtime. Task-number: QTBUG-92876 Change-Id: Ia05b6fdd59a637fef9c14b6ab284f4550414f908 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Use X-Macro for AST-visitor declarationSami Shalayel2023-04-121-650/+133
| | | | | | | | | Use the X-Macro to simplify the AST-Visitor and BaseVisitor definitions. Task-number: QTBUG-92876 Change-Id: I8f20490ae551a27a50cd037eb705baac3673eba5 Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Kill TypeArgument(List)Sami Shalayel2023-04-125-16/+0
| | | | | | | | | | | Remove the forward declarations of TypeArgument(List) and its uses. This amends e89a06753c772bd96b3299e03b2f7ad78ffc9fb9 that removed TypeArgument(List)'s definition while leaving its forward declarations and uses around. Change-Id: I1a3e27ce18611beaf84b7c59e01a622f9e7f2477 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Dom: add overload helper to create visitorsSami Shalayel2023-04-122-0/+33
| | | | | | | | | | Add a struct that helps overloading multiple lambdas to help write short visitors. Put it in a new private header qqmldom_utils_p.h. Task-number: QTBUG-92876 Change-Id: I6b830c4760550f9d4392edd8f3b156d9c8a2a686 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Mark dependency between QmlMeta and qmlplugin in a static buildAlexandru Croitor2023-04-121-0/+6
| | | | | | | | | | | | | | | | | Just like we do for workerscript plugin, in a project that uses a static Qt without using qmlimportscanner, linking to the qmlplugin automatically initialize the QmlMeta plugin as well. Otherwise the application errors out with: module "QtQuick" version 6.6 cannot be imported because: module "QtQml" plugin "qmlmetaplugin" not found import QtQuick Pick-to: 6.5 Fixes: QTBUG-112712 Change-Id: I566eaf94e2a13a8d8bb7b5509af1594c6c3206e9 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* QML: Allow some more backing types for enumsFabian Kosmale2023-04-127-16/+11
| | | | | | | | | Task-number: QTBUG-112180 Done-with: Fabian Kosmale <fabian.kosmale@qt.io> Change-Id: I48a2a696d3424ab1d8b9e693a92361a978ad70e9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Fix TapHandler signals in combination with exclusiveSignalsShawn Rutledge2023-04-112-20/+29
| | | | | | | | | | | | | TapHandler does not emit any singleTapped or doubleTapped signals after emitting it once, if exclusiveSignals is set to `SingleTap | DoubleTap`. This change corrects the behavior by resetting m_tapCount properly. Fixes: QTBUG-111800 Pick-to: 6.5 Change-Id: Ice7af2f41c2f30448004033d8330e733abe44110 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Fix PinchHandler.persistentTranslation; test cumulative native gesturesShawn Rutledge2023-04-113-30/+37
| | | | | | | | | | | | | | | | | | | | | Since we do not want persistentTranslation to be always the same as target.position, clearly we cannot use xAxis/yAxis to store the initial target position: thus the startPos() function was wrong, and is now removed. We need to store it in a separate m_startTargetPos variable like DragHandler does, and as PinchHandler did before 7867a683fcb938939fb2837a26ac8e1941e3fe08. Add an internal doc comment to clarify the arguments to QQuickItemPrivate::adjustedPosForTransform(). tst_QQuickPinchHandler::cumulativeNativeGestures() now checks the result of adjustedPosForTransform(): how far the target item moved. Pick-to: 6.5 Fixes: QTBUG-111220 Change-Id: I04237cb82a1abaaeab873a0d887acaf322f262ce Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Ignore tap events for table view when interactive is disabledSanthosh Kumar2023-04-112-1/+31
| | | | | | | | | | | | | | | | | | TableView uses QQuickTapHandler internally to handle tap events. This handler accepts tap events considering pointerNavigationEnabled property of table view. TableView accepts mouse events if either 'interactive' or 'pointerNavigationEnabled' property is set as true, otherwise, it has to pass mouse or touch events to the below item. This patch introduces QQuickTableViewTapHandler inherited from QQuickTapHandler that can explicitly check pointerNavigationEnabled property of QQuickTableView during wantsEventPoint to either accept or ignore tap events. Fixes: QTBUG-108596 Pick-to: 6.4 6.5 Change-Id: I330ae319706b6dbadc3a7319f62d636708aab995 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Add missing Direct3D12 enum value to GraphicsInfoLaszlo Agocs2023-04-112-0/+2
| | | | | Change-Id: I2f379ab944e46ec3d5e4631ac32eb28126034b37 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Fix problem with subFocusItem on non-OpenGL QSGAllan Sandfeld Jensen2023-04-071-1/+1
| | | | | | | | | | | | | | | The subFocusItem state was forgotten because the old parent was deleted, before its focused child was reparented. The test doesn't pass on Android and makes the test process exit with error. Since it prints warnings that indicate issues further down in the RHI stack, we'll skip it for now on that platform. Task-number: QTBUG-112696 Pick-to: 6.5 6.2 Change-Id: Ibb32a11564ff6fbb2091c241d508f12479b234b0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix Qt Quick Compiler docsFabian Kosmale2023-04-061-3/+3
| | | | | | | | A subtitle is not a section Pick-to: 6.5 Change-Id: I870df8d9a69f3a9975cc8c64c213dfaf58105523 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Correctly discover metaType for UntypedProxyPropertyMikolaj Boc2023-04-052-1/+10
| | | | | | | | | | | | | | | | | When attempting to set two behaviors on the same property, the second behavior's target property gets intercepted by the first behavior. Then, meta type for UntypedProxyPropertyBindable in UntypedProxyProperty's ctor will not be discovered correctly, since UntypedProxyPropertyBindable interface's metaType is explicitly set to nullptr. Use QUntypedBindable::metaType instead to access MetaTypeAccessorFlag via iface->getter. A warning shall also be reported in case two or more interceptors are set on the same property. Fixes: QTBUG-98896 Change-Id: Ie38ae75235e000e25a60a1c2ccaad70a46f5018e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Improve QUICK_TEST_MAIN_WITH_SETUP snippetSamuel Gaist2023-04-051-0/+12
| | | | | | | | | | The current snippet does not provide all the methods that are available to customize the setup and teardown of the test. This patch adds the two other methods that are called in the implementation. Pick-to: 6.5 Change-Id: Icfd298c9b987bd2a3fc6d05e588ae0962ea8ceff Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Material: add support for roundedScale to PaneFabio Falsini2023-04-051-2/+4
| | | | | | | | | | Pane should support Material.roundedScale property too to create a nice Material 3 interface in an easy way. Task-number: QTBUG-97993 Pick-to: 6.5 Change-Id: I9f30104c7a006129b07e56427e331bca26f83e06 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStackView: Fully-qualify enum type in invokable function signatureSze Howe Koh2023-04-041-2/+2
| | | | | | | | Fixes: QTBUG-112604 Pick-to: 6.5 Change-Id: I1916904fe899eb8cc167634babfb6451a0aa643f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: explain how to make a menu button close its menu when clickedMitch Curtis2023-04-041-0/+10
| | | | | | | | | Task-number: QTBUG-63614 Task-number: QTBUG-111595 Pick-to: 6.5 Change-Id: I739ffde0bf0b43e53c46d2c093d6c1f8f5182ec6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Remove the extra backslashAmir Masoud Abdol2023-04-041-1/+1
| | | | | | | Pick-to: 6.5 Change-Id: Ife3ae2398fb5d2e50cd6f46b1f22d8905b042612 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: remove "2" from Controls doc page URLsMitch Curtis2023-04-041-4/+0
| | | | | | | | | | | This was missed earlier as part of the changes that went in to 6.5. As it affects redirects, it's important that it goes in to the next patch release. Task-number: QTBUG-95413 Pick-to: 6.5 Change-Id: If1da80424687bceb345ef1b19047c1acc4e1a9dc Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* QtQml: Adapt to changes in QMetaObjectUlf Hermann2023-04-041-1/+1
| | | | | | | We need to take care of the newly added "type" member to enums. Change-Id: I6faa31098ea09689d17984d119f04e1f7dfd93a6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Improve QQuickAnimator::transition warning messageMitch Curtis2023-04-041-1/+2
| | | | | | | | | Use qmlWarning and actually print the conflicting property names. Task-number: QTBUG-111570 Pick-to: 6.5 Change-Id: I194e05d3d5a4d65d7a12dcff3318f7ec07ad075d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Docs: add module dependencies to configurationVolker Hilsheimer2023-04-032-0/+3
| | | | | | | | | | Fixes various warnings when qdoc fails to link to APIs in Network, SVG, or OpenGL modules. Pick-to: 6.5 Change-Id: I4b28ea746094e5d49d6129aa2914f744cda22474 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Docs: fix links to QJSManagedValue membersVolker Hilsheimer2023-04-031-1/+2
| | | | | | | Pick-to: 6.5 Change-Id: Icdb523cc61fdf01e4aba2b7506d3f071fe6b5adb Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Docs: fix link to performance documentation pageVolker Hilsheimer2023-04-031-1/+1
| | | | | | | Pick-to: 6.5 Change-Id: I32797e75ffa5e042c308db49e6d72bdbacdf9d1a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Docs: fix links to widthVolker Hilsheimer2023-04-031-5/+5
| | | | | | | | It's a property of Item. Pick-to: 6.5 Change-Id: Iea02314d88b7e6e2631293a8f3087cc755560797 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Docs: fix typoVolker Hilsheimer2023-04-031-1/+1
| | | | | | Pick-to: 6.5 Change-Id: I0f04c9fd33f314f4c8c008085fdaeafb16878340 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Docs: fix a few linksVolker Hilsheimer2023-04-033-15/+16
| | | | | | Pick-to: 6.5 Change-Id: I2c1c632346d09aa75c85c5a1081a683ef05b1aba Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Docs: remove more links to String::argVolker Hilsheimer2023-04-032-3/+3
| | | | | | | | There's only a single page about the `string` value type. Pick-to: 6.5 Change-Id: I781dc7ea53c293e1b3d3bdf4be59615e1c0fdf99 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QQmlStandardPath: always use QUrl::fromLocalFileRichard Moe Gustavsen2023-04-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | It turns out that the changes done in 4e38a6a1948b69cab1 was too hasted. QStandardPaths are supposed to always return local file paths, so converting them to URLs using QUrl::fromLocalFile() was semantically correct. The fact that the "local" file path on iOS was prefixed with a scheme was not relevant - it should just be seen as a part of the local file name. The iOS plugin that uses the path even expects the URL to start with "file:" ("file:assets-library://"). This patch will therefore partially revert 4e38a6a1948b69cab1, but keep the auto tests. It turns out that it's the iOS plugin that loads the image that needs to be fixed. Pick-to: 6.5 Change-Id: I1daaec7596bdbb8da5aec65c48bfd048f0c82d9d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlCompiler: Fix confused error messageUlf Hermann2023-04-031-3/+3
| | | | | | | | Amends commit aa4a1e96b8cdc5e6a5ea8e5e1c0406e9f496b92b. Pick-to: 6.5 Change-Id: Ia693e670dabc63d8c1034626ad57a89772ce4a6a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
View Lorry Controller Status