summaryrefslogtreecommitdiff
path: root/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlCompiler: Re-allow conversion from QObject to QStringUlf Hermann2023-05-091-0/+9
| | | | | | | | | | | | It only worked for the console functions in 6.5. There it was suppressed by the enforcement of type conversions in the basic blocks pass in dev. We have, however, a good enough way to coerce QObject to QString these days. Task-number: QTBUG-112291 Change-Id: I025976cc7fbe430c5cdc607cae3ca48838b24f88 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Properly support lists as method argumentsUlf Hermann2023-05-091-0/+4
| | | | | | | | | | | a, Teach QV4::QObjectWrapper how to convert QQmlListProperty to QObjectList. b, Parse the isList attribute from qmltypes. c, Resolve lists when resolving QQmlJSScope. Change-Id: I70c6d40507de990b45a87eb7d8c7bba279d550e8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML: Encode "missing" line number as negated address of stack frameUlf Hermann2023-05-091-0/+16
| | | | | | | | | | | | | | | This way we can identify which entry in a stack frame to amend when processing an exception in generated code. However, negative line numbers are also used to signal the position of "Ret" instructions. Since you cannot throw an exception from a "Ret" instruction, those cannot collide, but we cannot qAbs() the line number anymore when saving it in the stack trace. We have to qAbs() it in all the places where it's read. Pick-to: 6.5 Fixes: QTBUG-112946 Change-Id: I24dc4008fb7eab38e4d24e70211c22e46f1b72a7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML: Allow conversion from QV4::Sequence to different iterableUlf Hermann2023-05-091-0/+11
| | | | | | | Pick-to: 6.5 Fixes: QTBUG-112291 Change-Id: Idd47ea8daf9c54759af6c1feba68bd52d1163615 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Convert thisObject to correct typeUlf Hermann2023-05-041-0/+24
| | | | | | | Amends commit 365b781599993aef933228599eaeb6eb909d9a93. Change-Id: I5775d634ef4e5204cdec2f440b1992b7272866d2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Disallow reading from values affected by side effectsUlf Hermann2023-05-041-29/+46
| | | | | | | | | | | | | | Instead of accepting the inconsistency between interpreter and compiled code here, we can just detect whether a value can be affected by side effects and refrain from reading it then. Since you can always explicitly reload a value that may have been changed, the resulting compile warnings are easily worked around in user code. Refactoring user code this way also makes it much clearer what is actually going on. Pick-to: 6.5 Task-number: QTBUG-109221 Change-Id: Ica832e39838ef732b0d181364630737fd7709b74 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qmlcppcodegen: Sort methods alphabeticallyUlf Hermann2023-05-041-2474/+2471
| | | | | | | This way we won't get so many merge conflicts. Change-Id: I2630838d4d310141a6a427a6494c87cb73f79063 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML: Fix call frame conversion for QVariant return typesUlf Hermann2023-05-041-0/+26
| | | | | | | | | | | The function may return a QVariant in place of the actual type because it cannot express the actual type as-is. This case needs special care because QMetaType::convert() doesn't know what to do with it. Pick-to: 6.5 Fixes: QTBUG-112837 Change-Id: Ibf93a28aa6a60d49c5ab63fa7eed5f5a8e58e163 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Do not crash when converting number literals to enumsUlf Hermann2023-05-041-0/+14
| | | | | | | Amends commit 2a21efb5f7a6cac6f6101f2f42fe38f16dc68149. Change-Id: Id7d739b58c723eed9f165951b51ee2e5e55d7fe2 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* QmlCompiler: Do not stop parsing on top-level Component elementsUlf Hermann2023-05-031-0/+26
| | | | | | | | | | | | | This just creates an inconsistent state where some of the document has been parsed and some hasn't. The only thing we actually need is the log message. Also, fix the warning message. Amends commit 169f0f71665a3a5155f8d63a9c11bc2484353561. Pick-to: 6.5 Fixes: QTBUG-112897 Change-Id: Ie8486909f9bea9ee1b87f2857f7b77fb7cc561e8 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* QmlCompiler: Relax shadowing checkUlf Hermann2023-05-021-0/+13
| | | | | | | | | | | | | | | | | If we detect a property or method as potentially shadowed, we don't have to abandon all hope. We can still retrieve it as untyped var. Since there are a number of things we can do with untyped var, this may still be useful. In the same sense, we need to treat function calls as untyped when the function in question can be shadowed. Calling functions with var arguments and return types leads to some more interesting situations in the call frame setup, so we fix that, too. Task-number: QTBUG-112480 Change-Id: I238d1cf04951f390c73e14ed9e299f2aa72b68cb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Inline some array methodsUlf Hermann2023-04-281-0/+125
| | | | | | | | | | | So far we can only deal with methods that don't change the source array and don't use iterators or functions as parameters. We also omit concat() for now. However, indexOf(), lastIndexOf(), includes(), join(), slice() and toString() are possible already now. Task-number: QTBUG-112722 Change-Id: Id19c74e8ad25af876bc954c040c767823b7e3259 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Use actual type of enums, rather than intUlf Hermann2023-04-261-0/+5
| | | | | | | | | | Now that the type is available from qmltypes we can just use it. Task-number: QTBUG-112180 Change-Id: I315372da0925f19c209f676226f450863b0d3ea5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlCompiler: Implement ConvertThisToObject and basic DTZUlf Hermann2023-04-251-0/+10
| | | | | | | | | | | | | | We know that 'this' is a QObject* since the metatypes stack frame mandates it. Whenever you pass 'this' to anything it's loaded from the special 'This' stack slot which then triggers a DTZ check. A DTZ check is a noop if we can prove that the type is statically known, though. In QmlCompiler, if we have a valid register content, then the register has been set in all code paths that lead to the instruction in question. Fixes: QTBUG-111439 Change-Id: I81d1cd140eea63f85628c3bef3a8f6db0a12096d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Recognize QStringList and QVariantList as special listsUlf Hermann2023-04-241-0/+11
| | | | | | | | | | They are equal to QList<QString> and QList<QVariant>, respectively. We cannot express this fact in qmltypes, but since those are builtin, we can just hardcode it. Task-number: QTBUG-112227 Change-Id: Iebeb5f6a5350d1c7184b1d9e6a38647e048c3806 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Allow conversion from QQmlListProperty to QListUlf Hermann2023-04-241-0/+19
| | | | | | | | | | In the happy case this just retrieves the internal QList from the list property. In the sad case it produces a deep copy. That's not worse than what the interpreter does, though. Fixes: QTBUG-112227 Change-Id: I8b2b0ac74c90b6dcee876e83a64502756733c1c5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix content pointer check for QObject*Ulf Hermann2023-04-191-0/+26
| | | | | | | | | | | It can actually be null rather than undefined. We need to generate a separate check for that and output the correct error messages. Amends commit 05f56d7c78754855c643470ad4e8dfd35c96f927 Change-Id: Ia795e31805181640cd5be19359af51067d3fc8d6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlCompiler: Merge bool and any pointer type into the pointer typeUlf Hermann2023-04-151-0/+13
| | | | | | | | | 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>
* QmlCompiler: Support more integer typesUlf Hermann2023-03-301-9/+74
| | | | | | | | | | | This adds support for 8- and 16-bit signed and unsigned integer types. The test exposes that the engine fails to correctly convert out of range values when assigning to a 32-bit int property. Fix that as drive-by. Fixes: QTBUG-101634 Change-Id: I0a4177f49ffc062a1f444e30424e94c1f293e70c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlCompiler: Do not generate invalid code on generate_AsUlf Hermann2023-03-171-0/+15
| | | | | | | Pick-to: 6.5 6.5.0 6.2 Task-number: QTBUG-111986 Change-Id: Ib6e7179c20e6c7a4d6fc3a1a17eac550d2bbfa56 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Allow coercing anything to boolUlf Hermann2023-03-101-0/+26
| | | | | | | JavaScript can coerce anything to bool, so should we. Change-Id: Id560e4c1dc10b5432c0cedf3110ad3377bbc5f59 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Use value type ctorsUlf Hermann2023-03-091-0/+14
| | | | | | | | | | | | | This allows us to do the relevant conversions in a more civilized way, dropping the outputVariantConversion() method. The latter is brittle because you have to manually add it to each instruction, and it uses QMetaType::convert() which is actually not guaranteed to give the same results as a QML type coercion. Task-number: QTBUG-94807 Change-Id: I4d6d05a60beb3b4dfc3da6f0142de25667510904 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML: Allow as-casting to value typesUlf Hermann2023-03-031-0/+45
| | | | | | | | | | | | | | | | | | | | | | If the "Addressable" option to ValueTypeBehavior is set, you can use the "as" operator to cast a previously unknown type into either undefined or the given type. We can use this in qmlcachegen to generate efficient code for further operations on the same type. In the generated C++ it in fact only works for GetLookup because: a, We generally don't do SetLookup on value types, yet. b, We generally don't call methods on value types, yet. c, We cannot store a union of undefined and a sequence type, yet. However, getting properties of value types is the most important application of the new casts so this is well worth it. As a side effect we can also look up things in potentially undefined results of other operations now. For example list lookups. Task-number: QTBUG-94807 Change-Id: Ifdf34f1f3f67b7a0a8953b9ed0e947b74638a28c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Improve method overload selectionUlf Hermann2023-03-021-0/+11
| | | | | | | | If we have an exact match we should definitely use that. Change-Id: I2846ecf6f9963a978b84b70fbe18acdfe6eb45e6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QtQml: Always throw when requesting an enum from an invalid singletonUlf Hermann2023-03-011-0/+25
| | | | | | | | | | | The interpreter does this and so should the enum lookup adapter for generated C++ code. Pick-to: 6.5 6.4 6.2 Fixes: QTBUG-109816 Change-Id: I576480c3ca808743ddc0ceaf2f0bd8a1de776a41 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Implement multi-argument Math.{min,max}()Olivier De Cannière2023-02-231-0/+63
| | | | | | | | | | This patch extends the logic for the 2-argument Math.min() and Math.max() functions by reutilizing the same logic to compare two elements and evaluate all arguments with the current max or min. Fixes: QTBUG-108741 Change-Id: I993a26a1d44d66226c751272dfc2dc63330d115d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlCompiler: Implement get lookup of variantMap propertiesOlivier De Cannière2023-02-221-0/+11
| | | | | | | | | | | | | | | | This patch adds support for get lookups of QVariantMap properties. Setting or modifying is not supported and will reject. Also, QQmlJSRegisterContent::JavaScriptObjectProperty was renamed to QQmlJSRegisterContent::GenericObjectProperty Tests were added to TestQmllint::cleanQmlCode() and tst_QmlCppCodegen::variantMapLookup(). Pick-to: 6.5 Fixes: QTBUG-105545 Change-Id: I653ee4e7de1fb1514e1e563a92cfc28633268a7e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlCompiler: Fix coercion of undefined to float and doubleUlf Hermann2023-02-211-2/+26
| | | | | | | | | | | | | | | | It should result in NaN, not in 0. The typedArray() test exposes that ExecutionEngine::toVariant() also gets this wrong. Fix that, too. [ChangeLog][QtQml][Important Behavior Changes] Converting a JavaScript value to a double or float, for example by inserting it into a typed array, now assumes JavaScript type coercion semantics. In particular, converting a value that is not actually a number now results in NaN where it previously sometimes resulted in 0. Pick-to: 6.5 6.4 6.2 Fixes: QTBUG-111179 Change-Id: If24444ae9014c8972761c565a6920f06699e485c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmlsc: Support equality operations for QUrlSemih Yavuz2023-02-161-0/+18
| | | | | | | Task-number: QTBUG-110983 Pick-to: 6.5 Change-Id: I9a664178c91bfa2962e2a5a3bf4bfa174a74a9d0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Controls: Use PlatformDialogHelper for enums in DialogButtonBoxUlf Hermann2023-02-151-0/+17
| | | | | | | | | | | | | | | | Since we're already using 3 of the 4 enums in PlatformDialogHelper, we can just as well declare PlatformDialogHelper as extended namespace and avoid all the fiddling with Q_ENUMS and QFLAGS. As an additional upside, we get code using those enums to compile to C++ this way. Pick-to: 6.5 Fixes: QTBUG-110933 Change-Id: I60bfc15c94133be368fa98ee1b3a0ab7a2bc53ef Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* qmlcachegen: fix nonstrict equality code generationSemih Yavuz2023-01-311-0/+5
| | | | | | | | | | | | | | We should generate type checking code for only strict comparison of var against null/undefined types or vice versa cases. The non- strict comparison should be handled elsewhere. Removed pragma Strict to allow to add warning emitting tests of non-strict comparison. This amends 6a816a9e0dfc2b41a4f86c721679f2517ec27eb6 Pick-to: 6.5 Fixes: QTBUG-110769 Change-Id: I7f9a457e71a621a005f377216e841bec01667454 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qmlcachegen: Improve QObject comparison code generation testSemih Yavuz2023-01-311-0/+7
| | | | | | | | | | | | The code generated for QObject comparisons holds for both weak and strong comparisons. Improve tst_qmlcppcodegen by adding missing weak comparison tests. Amends afc7928d1a1e47ecbc9d101c4e5d5fb1c5b78326. Pick-to: 6.5 Change-Id: Ib6176a39b329e792b81b3d8e8a288dcea074320b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QML: Turn singleton/type mismatch into a run time type errorUlf Hermann2023-01-271-0/+17
| | | | | | | | | | | | | | | | | | | | | | | There are many ways to "hide" the qmldir from the engine at run time, which turns singletons into regular types. While all of this is invalid, we should not assert on it, but rather produce a legible warning. Furthermore, sharpen the importing of extra modules from qrc as implicit imports. We should really only import modules the file in question can ever be part of. Otherwise we needlessly produce the above situation and hide legitimate warning messages. Amends commit 7517c1b3ae9aa92f36b19d74a4b2de5e8531309b. Now we need to teach our tools about the default import paths in the resorurce file system. They cannot guess any type they may find in any resource file anymore. Pick-to: 6.5 Task-number: QTBUG-106929 Change-Id: Ic8c02396d10830a7f461e8a81649bb8c9a1add1f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* QML: Allow more conversions between different listsUlf Hermann2023-01-261-0/+11
| | | | | | | | | | You should be able to assign any list of QObjects to any other list of QObjects. Pick-to: 6.5 Fixes: QTBUG-108155 Change-Id: I6ddf0b49f7248ad56cc9560d217f3ea316c648a8 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* QML: Allow converting any object list to QQmlListPropertyUlf Hermann2023-01-251-0/+6
| | | | | | | | | We can use QSequentialIterable for this. Pick-to: 6.5 Fixes: QTBUG-110438 Change-Id: I7e82d0f089c9bb9eab46be46dedc2db3726e64b0 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* qmltyperegistrar: Strip '*' from list value typesUlf Hermann2023-01-251-1/+9
| | | | | | | | | | | | | | | | | We do this for function return types, property types, and function argument types already. Formally, we would have to store some "isPointer" somewhere, but considering that we never read it anyway, let's not go there. This allows the compilers to recognize lists of QObject-derived types as proper lists. This way we can generate better code for moving them around or getting their length. Pick-to: 6.5 Task-number: QTBUG-110438 Change-Id: I35e0fc21d574afc18799e9c3cef402f05b60a3ed Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* tst_qmlcppcodegen: Add QML dependency for AndroidFabian Kosmale2023-01-251-4/+0
| | | | | | | | | | | | qmlimportscanner is rather limited in how it works, and does not pick up the Qt.labs.folderlistmodel dependency for Dialogs. Pick-to: 6.5 Fixes: QTBUG-103044 Change-Id: I778f5c8981f1a2603bc3a5d2fd249a83de6c9bd8 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlCompiler: Wrap sequences with unknown elemnts in QVariantListUlf Hermann2023-01-231-0/+1
| | | | | | | | | | | Otherwise we later try to perform value type lookups on them. That won't work. Pick-to: 6.5 Task-number: QTBUG-110438 Change-Id: I1690a3375841ba5a1ff1a471a7f88bd2023ab4c4 Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML: Add a pragma for value type behaviorUlf Hermann2023-01-201-0/+35
| | | | | | | | | | | Unfortunately value types behave differently when compiled to C++. Document the difference and introduce a pragma to make them behave one way or the other. Pick-to: 6.5 Fixes: QTBUG-109221 Change-Id: Ib2685153c0b4ae209bafbea7a01229377fdb47dd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Handle various date and time conversions correctlyUlf Hermann2023-01-171-0/+37
| | | | | | | | | | | | | We can coerce QDateTime, QDate and QTime into each other because they would all be represented by a Date object in JavaScript. Furthermore we can coerce them all to QString. Technically, we could also coerce strings to all of them, but we don't want to because that is terrible. Fixes: QTBUG-109380 Change-Id: I176bfb5b715a6a6750cb5918c44261fa23fb8832 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Allow extraction of V4 values from QJSPrimitiveValueUlf Hermann2023-01-161-0/+5
| | | | | | | | | | Since we can produce QJSPrimitiveValue in metaTypeFromJS, we should also handle the other direction. Fixes: QTBUG-109867 Pick-to: 6.5 Change-Id: I2c7598d19eba3e78d071ca3eceb32deda4d0ead8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCachegen: Equality comparison ability to QObject *Semih Yavuz2023-01-101-0/+17
| | | | | | | | | | We should be able to compare QObject * with QObject * or a nullptr. Pick-to: 6.5 Fixes: QTBUG-109377 Change-Id: I0e9d6fdc89cbb471774d6382316dfb4813310e1d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlCachegen: Equality comparison ability to var and void/null typesSemih Yavuz2023-01-061-0/+22
| | | | | | | | | | | | | | | The code generator currently rejects any comparisons other than primitive types. Add comparison capability for var types against null or undefined types and vice versa. To achieve this, we generate code that fetches the contained object within the variant and comparison is done depending on the stored type. Ideally, we also need to add comparison capability for QObject *, that will be handled with QTBUG-109377. Pick-to: 6.5 Fixes: QTBUG-108632 Change-Id: Ib15450d7922f6025c78def5cc548c74827ad740f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlCompiler: Test that infinities cleanly cast to intUlf Hermann2022-12-231-0/+20
| | | | | | | Task-number: QTBUG-108820 Change-Id: I984f6f35ffd32ca9adae31e56010d10c683e5615 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* QmlCompiler: Fix recognition of builtin list typesUlf Hermann2022-12-151-0/+7
| | | | | | | | | | | | | Previously all list types used as arguments or return types for methods had to be looked up via the imports. However, builtin types are not part of the imports at run time. Therefore, recognize list types already early on, when generating the IR. This is the same way we do it for property types and it allows us to easily identify lists of builtins. Pick-to: 6.5 Fixes: QTBUG-109147 Change-Id: I91fa9c8fc99c1e0155cc5db5faddd928ca7fabbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlCompiler: Fix wrapping of numbers in QJSPrimitiveValueUlf Hermann2022-12-151-0/+46
| | | | | | | | | | | | | | | | | | We need to explicitly cast to double if we are wrapping a number type that's not natively accepted by the ctors. As a side effect, correctly run conversions from generic QVariant to QJSPrimitiveValue through the engine now. For that we need another clause in metaTypeFromJS(). Since we are calling methods that return list types in the test, we need to add another clause that converts JS arrays to list types. Otherwise we cannot run that test in interpreted mode. Pick-to: 6.5 6.2 6.4 6.4.2 Task-number: QTBUG-109111 Change-Id: I87f7aafd24371d2c1ffe85569e1f2cd3a1979742 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Mark StoreElement on JS values has having side effectsUlf Hermann2022-12-151-0/+16
| | | | | | | | | | A StoreElement on a JS value can do pretty much anything you can imagine, after all. Pick-to: 6.5 6.4 6.4.2 Fixes: QTBUG-109196 Change-Id: Ic638d94b55e6340eb9fe56abc663a6f0f2277f5e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQmlJSCodeGenerator: fix nullptr dereferenceFabian Kosmale2022-12-121-0/+11
| | | | | | | | | | | | | If we try to lookup the length of a generic QVariant, we fail, and so far crashed. We should ideally detect that we are dealing with an array (and thus length is a known, available property), but for now simply reject compilation to C++. Pick-to: 6.4 Fixes: QTBUG-109164 Change-Id: I9d4149ac09a351754d012dbc829774413d6b32eb Reviewed-by: Semih Yavuz <semih.yavuz@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* QML: Unify postprocessing of importsUlf Hermann2022-12-071-0/+11
| | | | | | | | | | | We want to always import dependencies, always import qualified scripts, and always try to load C++-based types from the binary. Furthermore, directory imports should be imported with their qmldir URI where possible, so that we can find them when loading local C++-based types. Fixes: QTBUG-109109 Change-Id: I58f08f479623a886c802035b41f5f604338468b5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Ignore cloned signals when analyzing signal handlersUlf Hermann2022-12-071-1/+18
| | | | | | | | | We obviously want to see the defaulted parameters when generating the handlers. Fixes: QTBUG-108762 Change-Id: I33a52bac305238467d45650bf8a2ad59d40e366f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>