aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlproperty
Commit message (Collapse)AuthorAgeFilesLines
* Correct license for test filesLucie Gérard2024-02-272-2/+2
| | | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I26d72e8de04d4c7c57b3b7838af5d033265de5ba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QtQml: Re-allow change signals in QQmlPropertyUlf Hermann2024-02-261-6/+23
| | | | | | | | | | Amends commit a1ce0596e517e84913b14ab23422137c95b8c785. Pick-to: 6.7 Task-number: QTBUG-109548 Change-Id: I476c1798bb9a125264375e6fb0829e1357d99770 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QQmlProperty: fix signal handler warningFabian Kosmale2024-01-302-0/+23
| | | | | | | | | It should only be emitted if we find a signal of that name. Pick-to: 6.7 6.6 6.5 Fixes: QTBUG-118710 Change-Id: I15cf92c03dd7b46805e5a69078ca2beb6c862293 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qqmlproperty: Output errorString if component not readyUlf Hermann2024-01-231-0/+1
| | | | | | Change-Id: Icc666e9e470be6f17a9ddf9c220ebef7f707f8e1 Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Make qml tests standalone projectsAlexandru Croitor2023-07-051-0/+6
| | | | | | | | | | | | | | | | | Add the boilerplate standalone test prelude to each test, so that they can be opened with an IDE without the qt-cmake-standalone-test script, but directly with qt-cmake or cmake. Boilerplate was added using the follow script: https://git.qt.io/alcroito/cmake_refactor Manual adjustments were made where the code was inserted in the wrong location. Task-number: QTBUG-93020 Change-Id: Ia68c9d263e7454f0c4a26c29b10f1c535d08e2f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* QML: Guard QProperty change triggers against deletion of targetUlf Hermann2023-06-162-0/+79
| | | | | | | | | | Previously, we relied on QObject* pointers being unique even after deletion of the objects. That's not good. Pick-to: 6.6 6.5 6.2 Fixes: QTBUG-114329 Change-Id: Ia0a2c1d2cb5d8a0d47ec00e73424c959c59c09bc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Only signal list variable assignment onceMikolaj Boc2023-04-222-0/+29
| | | | | | | | | | Lists are internally cleared and each element is pushed to the back from the source list in QML. Use nonsignaling operations for clear and push and activate manually having performed the operations. Fixes: QTBUG-112208 Change-Id: I1a995905f3fa758e4cc8c39b8576db668d84a067 Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-01-201-2/+2
| | | | | | Task-number: QTBUG-99238 Change-Id: Ia11c9cbd7c06347319ab3674ec0cd8da0214747e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QML: Re-allow assigning QVariantList to arbitrary other listsUlf Hermann2023-01-042-0/+49
| | | | | | | | | | | | | | | | | Since we can assign a QVariant to any other singular value, we should be able to do the same with lists of QVariant. This ability was lost when we stopped converting QVariantList to JS array but rather started to express it as QV4::Sequence. As a drive-by, generalize the messy code that allows assigning singular values to lists. This should also just work for any singular value and any kind of list. Fixes: QTBUG-109584 Pick-to: 6.4 6.5 Change-Id: Icab1dceff332c5fc4fae9e7e8a8b5fde9f0b0ea9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Port from container::count() and length() to size() - V5Marc Mutz2022-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to handle typedefs and accesses through pointers, too: const std::string o = "object"; auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); }; auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) { auto exprOfDeclaredType = [&](auto decl) { return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o); }; return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes)))); }; auto renameMethod = [&] (ArrayRef<StringRef> classes, StringRef from, StringRef to) { return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)), callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))), changeTo(cat(access(o, cat(to)), "()")), cat("use '", to, "' instead of '", from, "'")); }; renameMethod(<classes>, "count", "size"); renameMethod(<classes>, "length", "size"); except that on() was replaced with a matcher that doesn't ignoreParens(). a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'. Change-Id: I58e1b41b91c34d2e860dbb5847b3752edbfc6fc9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Avoid memory leaks in tst_qqmlproperty.cppUlf Hermann2022-09-141-157/+145
| | | | | | | Wrap everything we allocate in QScopedPointer. Change-Id: Idf1bd091f69bad400259222c720eae083f16ac03 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-09-071-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: Id89ed14990804a5024183e75382cc539d4293da1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't use PUBLIC_LIBRARIES for tests and test helpersAlexandru Croitor2022-07-281-1/+1
| | | | | Change-Id: I1cd769f85d5f82c43639d6787d98e536619249e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-081-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I72c89a98c42bbc9234d8495e9e503bec81d11037 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-112-54/+4
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Generalize role selection mechanism from QQuickComboBoxUlf Hermann2022-05-111-4/+3
| | | | | | | | | | | | | | | | | | | | | We can have QQmlDelegateModel pick specific roles from model items. That can easily be done for variant maps, variant hashes, objects and gadgets. We would like to do it for anything that has a QMetaAssociation, but as we cannot get to the original type at that place, it's currently not possible. The special case about variant maps with exactly one item in variant lists is clearly insane and therefore not included in the generalization. This requires some cleanup in the QQmlGadgetPointerWrapper. Passing the wrapper itself to QMetaProperty::read() has always been a rather obscure way of reading from the gadget. Pick-to: 6.3 Fixes: QTBUG-102983 Change-Id: I84ecef980783e7137aa4d77070ddce47b6ead260 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Replace uses of deprecated _qs with _s/QStringLiteralSona Kurazyan2022-04-291-6/+8
| | | | | | Task-number: QTBUG-101408 Change-Id: Ic925751b73f52d8fa5add5cacc52d6dd6ea2dc27 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Repair tst_qqmlproperty on AndroidAndreas Buhr2022-04-051-0/+4
| | | | | | | | | | tst_qqmlproperty tries to start itself in another environment using QProcess. This does not work on Android. Task-number: QTBUG-101865 Pick-to: 6.2 6.3 Change-Id: I8e0410cf315e53899a88cf1b3c9dfba605b7f4d9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix warnings in tests after QQmlListReference changeVolker Hilsheimer2022-03-211-3/+3
| | | | | | | | The engine parameter is no longer used. Pick-to: 6.3 Change-Id: Ifc630eb4803a015d41df50210bd86947f6a5a472 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QQmlProperty: Prohibit ID lookup on explicitly given objectUlf Hermann2022-01-211-0/+2
| | | | | | | | | | If an object is given, we should only use that object. Amends commit 21f15ede606df028479335c64c333db5fb1bb3f7. Pick-to: 6.3 Task-number: QTBUG-100110 Change-Id: I51c0a44750c31984ba4937fb1cd2405dd93fcc19 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Don't crash when accessing QVariant data pointerVolker Hilsheimer2021-12-112-0/+38
| | | | | | | | | | | | | | | | | | | | | | The write method is called with a QVariant, and even though the property might be of a QObject type, the variant might not contain a QObject. So accessing the variant data directly via QVariant::constData and static_cast'ing the void* to QObject* is not safe. Add an explicit check before accessing. An alternative would be to at least Q_ASSERT that the result of the cast and a QVariant::value call is the same, which would then not introduce any performance penalty in release builds. However, users use release-builds of qml and Qt tooling to write QML, and we writing wrong QML code should not crash then either. Include a test case that segfaults without the fix. Pick-to: 6.2 Fixes: QTBUG-98367 Change-Id: Ib3ae82d03c9b2df6251ee88d5bd969dd4f796a41 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Do not crash on self-assignment of QQmlPropertyUlf Hermann2021-11-101-2/+13
| | | | | | | | | If you had a QQmlPropertyPrivate with only one reference, assigning its QQmlProperty to itself would delete the QQmlPropertyPrivate. Pick-to: 5.15 6.2 Change-Id: I73f8e6df63af09d3f43a101749a5800153499057 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix compiler warningVolker Hilsheimer2021-11-091-1/+1
| | | | | | | | | | | tst_qqmlproperty.cpp:2426:55: warning: loop variable 'flagSet' of type 'const QQmlPropertyPrivate::InitFlags' (aka 'const QFlags<QQmlPropertyPrivate::InitFlag>') creates a copy from type 'const QQmlPropertyPrivate::InitFlags' [-Wrange-loop-analysis] Use idomatic "const auto &" in ranged for loop. Change-Id: I9efcf5dad6204ddd6ddbc117f87d3b1f7c943fc1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQmlProperty: Add flexibility to initProperty()Ulf Hermann2021-10-271-0/+111
| | | | | | | | | | | | | | | | | | | | Using private API, you can now construct a QQmlProperty from an unknown object by passing a dot-separated string that starts with an ID. You can also have a plain signal name (without "on") as the last part of the name. Both variants are optional and have to be enabled via flags. In Qt7, we should clean up the "on" vs. plain signal name affair. For now we can't because everything expects the "on". Constructing properties from ID'd objects can only be done in specific places. Therefore this has to be manually enabled. Furthermore, you can now create properties, not only signals, from plain QMetaObjects. This is enabled unconditionally because there was no reason for this to not work before. Change-Id: I9ff764130b70f9d023ab63d492f83290e8e87ef3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add a Pragma for list assign behaviorUlf Hermann2021-10-136-0/+174
| | | | | | | | | | [ChangeLog][QtQml] You can now specify the list property assignment behavior in QML using the "ListPropertyAssignBehavior" pragma. This is analogous to the macros you can use in C++. Fixes: QTBUG-93642 Change-Id: I9bdcf198031f1e24891f947b0990a3253d29a998 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML engine: Resolve URLs on property assignment when given an env varFabian Kosmale2021-10-061-0/+42
| | | | | | | | | | | | | This is a partial (and manual) revert of 0a1e4cc7ec7548f6273befff9cdddb0bc7a58961. We still do not intercept during property assignment, but relative URLs get resolved in the current context if QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT is set. Pick-to: 6.2 Task-number: QTBUG-95587 Change-Id: Ib2955541d2626fd26d3886b33f8ba0c2f940779b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Consolidate test helpers into private librariesMitch Curtis2021-09-132-5/+3
| | | | | | | | | | | | | | | | | | | | Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Make qt6_qml_type_registration() internalCraig Scott2021-08-251-1/+1
| | | | | | | | | | | | | This renames the command to _qt_internal_qml_type_registration(). The tests are only updated to use the new name so as to keep this to a minimal change. Fixes: QTBUG-95093 Pick-to: 6.2 Change-Id: Ie3a7f6adc312050df64213fdcdc62886ad21ff01 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* QQmlProperty: Implement DontRemoveBinding support for QPropertyFabian Kosmale2021-05-121-0/+27
| | | | | | | | | | | | | | | | | The animation system currently relies on being able to write to properties through the meatobject system without breaking their bindings. This patch ensures that the DontRemoveBinding flag is honoured for QProperty based bindings, too. It is implemented by setting the private stick flag on the binding before doing the write and then removing it again after the write is done. This roundabout approach is necessary as the BindableInterface does not expose the setValueBypassingBindings functionality, and simply writing to the propertyDataPtr would prove disastrous in the case of QObjectCompatProperty. Fixes: QTBUG-91689 Change-Id: Ife1afb9c94190f1c4e9658a7193aba6dbdaa281f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix some "can be marked override" warningsAndreas Buhr2021-02-231-1/+1
| | | | | | Change-Id: I13da0d085901314950c4fa0afb5853e183652e67 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QQmlPropertyPrivate::signalExpression: handle object being nullFabian Kosmale2021-02-191-0/+10
| | | | | | | | | | | | | | QQmlData::get expects a non-null pointer, therefore we need to check whether the object still exists. Note that while this fixes the crash in the referenced bug, PropertyChanges still does not support a dynamic target. Pick-to: 5.12 5.15 6.0 6.1 Task-number: QTBUG-46350 Change-Id: Ifeecf5df83e87468a1d314ce2b120006124d6f4b Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove the qmake project filesFabian Kosmale2021-01-151-17/+0
| | | | | | | | | Remove all qmake project files, except for examples which are used to test that qmake continues to work. Change-Id: Ic4abb72dc2dcd75df7a797c56056b6b3c5fe62ac Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qqml.h: Add QML_IMPLEMENTS_INTERFACESMaximilian Goldstein2020-11-232-15/+4
| | | | | | | | | | Needed in order to allow for the declarative registration of classes implementing interfaces. Fixes: QTBUG-88623 Pick-to: 6.0 Change-Id: Id9c1ae92774dd9c316ceaa737cb48ef28f56545c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* tst_qqmlproperty: Fix interfaceBinding crash on MSVC 2019Maximilian Goldstein2020-11-182-8/+25
| | | | | | | Change-Id: I4bb4a66b7ccca838e058962bbc297659b273c78e Done-with: Fabian Kosmale <fabian.kosmale@qt.io> Fixes: QTBUG-84416 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qqmlproperty: Skip crashing interfaceBindingMaximilian Goldstein2020-11-171-0/+3
| | | | | | Task-number: QTBUG-84416 Change-Id: I79048233041802fe74e28b07def5ca0a3181c358 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qtdeclarative: finish fixing compilation with explicit QChar(int)David Faure2020-11-071-2/+2
| | | | | Change-Id: Idb26e2df6d4fe8940db57066a30fa8c243f6d2c9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update tests to use new metaType systemDavid Skoland2020-11-021-14/+14
| | | | | | | | Change from the QVariant enum to the QMetaType enum and prefer typeId over userType where possible Change-Id: Ic89c55978d46cc23d23b8e9c82c475c0c220fae3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-061-3/+3
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Remove deprecated registration functionsFabian Kosmale2020-08-271-1/+1
| | | | | | | | | | | | | | [ChangeLog][QML] Removed qmlRegisterType overload taking no arguments, use qmlRegisterAnonymousType instead, or switch to declarative type registration with QML_ANONYMOUS. Removed overloads of qmlRegisterExtendedType and qmlRegisterInterface which did not take a version argument. Use the overloads providing a version, or swtich to declarative type registration with QML_EXTENDED and QML_INTERFACE. Change-Id: Iadcc53d7ebe5cae40856b69efc33293fd0208c1f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add override behaviors to QQmlListPropertyUnai IRIGOYEN2020-08-227-1/+90
| | | | | | | | | | | | [ChangeLog][QQmlListProperty] When overriding a QQmlListProperty in a derived QML type, the default behavior is to append the derived class elements to the base class ones. This introduces a macro to allow replacing the base type contents either always or if the property is not the default one. Fixes: QTBUG-77529 Change-Id: Ib1abbf52e341c043344c347c612928b47856fb3e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix tst_qqmlproperty failures due to stricter QVariantMaximilian Goldstein2020-08-201-3/+3
| | | | | Change-Id: Ie1f0ee6ae076e50053a19b19e48fe6e996696a69 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* Do not resolve URLs when assigning them to a propertyUlf Hermann2020-06-221-14/+10
| | | | | | | | | | | | | | | We don't know in advance if a URL is part of the source code and should be relative to the current element, or if it is part of the application data and should not be touched. [ChangeLog][QtQml][Important Behavior Changes] URLs are not resolved or intercepted anymore when assigning them to a "url" property. Instead they are resolved and possibly intercepted when used to access an actual resource. Fixes: QTBUG-76879 Change-Id: Iaa2385aff2c13aa71a12e57385d9afb5dc60a073 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Revert "Decode directory separators in source URLs"Ulf Hermann2020-06-221-2/+1
| | | | | | | | | | | | | | | | This reverts commit 7ec30c51b287159377761338fe6d3b48706d74ee. We don't want to half-decode directory separators on assignment. This just introduces inconsistency down the line. [ChangeLog][QtQml][Important Behavior Changes] Percent-encoded directory separators in URLs are not automatically decoded on assignment to url properties anymore. This was obviously not a good idea to begin with. Fixes: QTBUG-81244 Change-Id: I1938abbe8aada88beff0d628397674255e8b2472 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Don't install .qmltypes for Qt tests, examples and toolsAlexandru Croitor2020-05-291-1/+0
| | | | | | | | | | | that don't have an explicit QT_QML_MODULE_INSTALL_DIR path specified. We don't want to pollute the Qt qml import path with these files. Task-number: QTBUG-84403 Change-Id: I768267e0e79daa8090d882c301648cce14e1a809 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Update Apple platform defines after rename in qtbaseTor Arne Vestbø2020-03-171-2/+2
| | | | | Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: Regenerate and adapt to merge from devwip/cmakeAlexandru Croitor2020-03-121-0/+13
| | | | | | Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-124-97/+262
|\ | | | | | | | | | | | | | | Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-131-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4engine.cpp Change-Id: I61f41672e2dfe7e542ca30fed5f173d0a9ee3412
| | * Fix QQmlProperty and Connections for properties starting with '_'Fabian Kosmale2020-02-111-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | We do a weird renaming for the change handler of properties starting with '_', now we do it at least in a consistent way. Fixes: QTBUG-82017 Change-Id: I1535a5ee462f3a344c972461f1fb954f039aa854 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Add a static variant of qmlRegisterInterface()Ulf Hermann2020-02-122-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlRegisterInterface() should not be called procedurally, for the same reason that qmlRegisterType() should not be called procedurally. Also, add URI and major version parameters to qmlRegisterInterface(), and deprecate the typeName parameter. We want to identify which import an interface belongs to. Task-number: QTBUG-68796 Change-Id: Iba3d66e5ce6219b30aadba34396f12fca92f35a7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 12:49:53 +0000