aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qtdeclarativev6.2.0-beta1Qt Submodule Update Bot2021-06-301-3/+3
| | | | | Change-Id: I506ada186c5eccfd8427eef7d749ad40be0a8275 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QtQml: Move locateLocalQmldir and make it a templateUlf Hermann2021-06-298-119/+169
| | | | | | | | | | | | | | | | It conceptually belongs into QQmlImportDatabase because it messes with the qmldir cache. This way, if we reject a qmldir file for whatever reason, we can still check for further matching qmldir files in other places. We might, for example determine that we need to load a plugin, but we have been given a qmldir file in the resource file system. In that case, we want to check for other instances of the same module in the host file system. Change-Id: I8fe4a0f188f3732b9d10d017a94562e8bd1fb242 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit dbca762f45d3249974652cccb5d6421440f852ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-291-3/+3
| | | | | Change-Id: I7dbfde4c55d6cf5103d33531c223b17a66a4c2cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QtQml: Refactor plugin loading into a separate classUlf Hermann2021-06-286-583/+776
| | | | | | | | | | | | The methods that load the plugins were suffering from an excessive number of parameters, and were dispersed across several classes. Concentrating them in one place and transforming all the parameters into members makes the code more readable and easier to extend. Change-Id: I67e4f49567ad37363a0f38d8f7773de863856554 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 686fdc218fade4a72b6b2be0b1a16b88b778f8b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix warningsAndreas Buhr2021-06-281-2/+2
| | | | | | | Change-Id: I9dda78c04ce061767e719eb135ef8922c88704f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ac7b6617feca7fe5f63e71f8285090c74758d723) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Split version string interpolation into separate functionIikka Eklund2021-06-281-1/+5
| | | | | | | | | Make the readibility and syntax highlighting a bit cleaner. Change-Id: I46f0eed30124e1155b746c2e9c9e2c272a5a3d59 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e34a5435fc8fcb4732f0c1b73ae2a7d553de9ed2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-261-3/+3
| | | | | Change-Id: I8136f662170ecca53dfd4103cbeb779498bdbfe3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Restore CMake auto testsAlexandru Croitor2021-06-253-52/+69
| | | | | | | | | | | | | | | This is mainly a preparation change to allow adding new tests. Some of the tests still need to be ported to use the new 6.2 QML module creation API, because running qt_add_resources doesn't process QML files anymore. Change-Id: I249931eb2b4de32a204283ae1bf8698ec5a48980 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 0170258ca0c5c116df3e598b45ff3c29d16e8803) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Rename qt plugin targets to end with PluginAlexandru Croitor2021-06-2512-17/+29
| | | | | | | | | | | So that CMake automatically calls find_package for each of those plugins when the module they belong to is find_package()d. Change-Id: I0c9badc29227e60bbe344de3b2c5fbe887dab3e2 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6c243002092feaeb179fb2bc48de0a8865bbf58d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Update warning about qtquick_compiler_add_resourcesAlexandru Croitor2021-06-251-3/+4
| | | | | | | | | | | To mention qt_add_qml_module instead of qt6_add_resources. The latter does not process qml files anymore. Change-Id: I12ce2b60b1d20cbfc9c781e3f15f7999f5ba563d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 63b91343adb63adf514887fa84f8bef3c04a0f12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix static builds on WindowsKai Köhne2021-06-251-1/+8
| | | | | | | | | | | | Fixes issues like qml_qmltyperegistrations.cpp(28): error C2375: 'qml_register_types_QtQml': redefinition; different linkage qtbase\include\QtQml\6.2.0\QtQml\private\../../../../../../../src/qtdeclarative/src/qml/qtqmlglobal_p.h(62): note: see declaration of 'qml_register_types_QtQml' Change-Id: I063b60638978faa4e79cbf7eb75849a367730893 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit d0cb449208ff618498e3e129b4af1b22086da082) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* DomItem: Move newline character out of translated messageFriedemann Kleint2021-06-251-1/+2
| | | | | | | | This will likely be overlooked by translators. Change-Id: Icbcedc2bd3c04f6b9f06f2740c3d0a5db54036d6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5345349d5de897dac3dbf25e3e17a00c6545ac81)
* CMake: Assign output targets to appropriate export setsAlexandru Croitor2021-06-252-9/+53
| | | | | | | | | | | | | | | | | | | Plugin initializer targets should go to the plugin export set. The rest of the output targets (resources and qmlcache object libraries for now) should go the main backing target export set. Also generate the missing additional target info files for each export set. Task-number: QTBUG-93257 Task-number: QTBUG-92933 Change-Id: I0b13a15459f3c6379bf87de1819fda97ade8c416 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 0bb503cd277e32895a74ad058f03a4c51a865b4a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Use object library initializers for qml pluginsAlexandru Croitor2021-06-253-68/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like we do for regular plugins, pre-build Q_IMPORT_PLUGIN object libraries for qml plugins, which will then be linked by qt_import_qml_plugins (instead of generating and compiling a unity source file). This is done both for Qt qml plugins and user-created qml plugins. The advantage of this approach is that user project build time will be faster due to not having to generate and compile the Q_IMPORT_PLUGIN calls. Another advantage is that the plugin initializers will propagate across static libraries to the final executable or shared library, even if any intermediate static libraries are linked privately. This is achieved by using __qt_internal_propagate_object_library from qtbase and is subject to the CMake version used as well as the capabilities of the linker to handle link cycles. Remove code path that generates and compiles Q_IMPORT_PLUGIN calls at qt_import_qml_plugins time. There shouldn't be cases where this is necessary because all plugins built with qt_add_qml_plugin will have a plugin initializer object library. This reduces implementation complexity and issues with propagating the initializers across multiple static libraries. Task-number: QTBUG-92933 Task-number: QTBUG-93257 Task-number: QTBUG-94605 Change-Id: I0a04f904d6b3089b04f9e6e206143f7a205653bf Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1a78a6df1dd0c7139ab77231dbffbd6dd49992dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-251-3/+3
| | | | | Change-Id: Ie61dc7afc37da2e50719436515645ff593f08ebf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Add qmldir classname entry only if there is a pluginUlf Hermann2021-06-242-1/+29
| | | | | | | | | A class name without a plugin is pointless. Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 88424ba1bfeba768bf6157963a06b1ed72ff63ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Copy RESOURCES files to the build directory, tooUlf Hermann2021-06-242-31/+29
| | | | | | | | | We need to treat them exactly like QML_FILES. Change-Id: I5582ad933c844c55f9015478672607e6d1218d84 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c9e901db891336434b682dd92ec8e2d18a8e7c03) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add basic QML application to test CMake API for QML modulesUlf Hermann2021-06-2412-0/+344
| | | | | | | | | | An application with two modules which allows us to check that all the files end up in the right places. Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5e78dc847d64cf99548d2b26cd957fb550c90cf2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmllint: Add detailed documentationMaximilian Goldstein2021-06-243-17/+118
| | | | | | | | | | Fixes: QTBUG-94048 Change-Id: Ie80151381efe8f950e8a158f1aeb0dc5be154c64 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 4bf29e799d1f949d384f8a16e49177363f2b2fe2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmllint: Hide deprecated optionsMaximilian Goldstein2021-06-241-9/+11
| | | | | | | | | We shouldn't keep advertising options we're deprecating anyway, just warn when they are still passed to qmllint. Change-Id: Ibe53c51fc473719d021f912243921b6511ebd2f4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit b4d9bf79e1b3cf17d2a2473ae9901b9aec22f409)
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-241-3/+3
| | | | | Change-Id: I0832a51d8dcc587c21892ab270104b64dc3c39fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Use DragHandler rather than MouseArea in the externaldrag snippetShawn Rutledge2021-06-231-10/+10
| | | | | | | | | Task-number: QTBUG-68078 Task-number: QTBUG-76310 Change-Id: Id7b971f5147474274200ef2fdd52ce21f8d60bdd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5971a6faaa1124f5ef3f0b42d4ed0298cf8096a3) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-231-3/+3
| | | | | Change-Id: I20d760d41022aa905f71faabaecce507cfe3299b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't check QT_QML_MODULE_RESOURCE_PATHS during file generationAlexandru Croitor2021-06-231-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _qt_internal_target_enable_qmlcachegen is called if at least one qml file needs to be processed by qmlcachegen. Thus checking for QT_QML_MODULE_RESOURCE_PATHS not to be empty when generating a qmlcache_loader.cpp file makes no sense, we already know at least one file will be processed. If the assumption above were not true, e.g. QT_QML_MODULE_RESOURCE_PATHS was empty and _qt_internal_target_enable_qmlcachegen() was called, the _qt_internal_propagate_qmlcache_object_lib() -> add_library(OBJECT) call would fail trying to compile a file that does not exist (was not generated). Remove the genex checks for QT_QML_MODULE_RESOURCE_PATHS. This fixes qmlcache object libraries to be linked to consumers with static Qt builds. Before this change the qmlcache object libraries were not linked at all, because the QT_QML_MODULE_RESOURCE_PATHS genex check in target_link_libraries failed due to the QT_QML_MODULE_RESOURCE_PATHS values not being exported. Change-Id: Iec66c747b4189c0219aeb930e7c9c61f22d03d9b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 36827a9011ce008673d7a9b73bc74ee208ea8ebd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix placeholder in translated messageFriedemann Kleint2021-06-221-1/+1
| | | | | | | Change-Id: I8b561716f720a3e85a5c3eb41eaaa42f1620b104 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 704032a04edcabe6f69f723bb96bce4197ddb445) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ensure model is in context if required properties are not usedFabian Kosmale2021-06-224-1/+76
| | | | | | | | | | | | | | | | | | | | | | | We need to set the set the contextObject already in QQmlDelegateModelPrivate::object, as the context property might be accessed in a child component before we are able to run setRequiredProperties (which would set-up the context in case there are no required properties). Instead of delaying setting the context object, we clear it now in setRequiredProperties. This has the drawback that one might be able to access context properties on initial component setup which should not exist (due to the presence of required properties). This could be avoided by inspecting the Compilation Unit and only setting the context if we do not find required properties, however that needs further work to expose the necessary information. Fixes: QTBUG-94223 Change-Id: I678de81408539417fc650f94da4c9f0d3167653d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 58cd06033cacadab541efaa16a3eecec37dab0fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmllint: Ignore unqualified access in custom parser componentsMaximilian Goldstein2021-06-224-0/+26
| | | | | | | | | | We currently can't handle all special cases with custom parsers (i.e. signal transitions) so we need to ignore unqualified accesses except for those specific instances where we already have some special handling implemented (e.g. Connections). Task-number: QTBUG-77417 Change-Id: Iea86d4b56e56091c7acffc29a0259de412fa1624 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4063895a28bb454995d6b4ee57e4f2c3b5dcc5d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmlformat: Use the Qt version instead of 1.0Maximilian Goldstein2021-06-221-1/+1
| | | | | | | | | This makes way more sense than just sticking to 1.0 forever or introducing our own tooling versioning and is consistent with qmllint. Change-Id: Id797191e6b343b97831409e8d5f888761f91b1d5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 81ad9f39aff34a6c7b12a7611f62b55dec571558) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-221-3/+3
| | | | | Change-Id: I3c78a0a2f96f0b68b37acc0d12de66ad8c9010d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativev6.2.0-alpha1Qt Submodule Update Bot2021-06-211-3/+3
| | | | | Change-Id: Ia5a59ffaf612f54f85860916e7a9d7c85d01ae11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add conanfile.py to support builds with ConanIikka Eklund2021-06-212-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | The build recipe uses the qtbase's 'bin/qt-configure-module' script directly which is recommended when building other Qt modules ouside the qtbase's -prefix. The recipe uses functionality from qt-conan-common Conan package via 'python_requires'. This recipe sets it's own Conan options that match with the module configure options. The recipe sets it's version number based on QT_REPO_MODULE_VERSION and QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT in .cmake.conf file. The dependency to qtbase, qtsvg and qtshadertools is declared using semantic versioning so that it will pick the latest available prerelease or final version of the major.minor.patch. Task-number: QTBUG-94384 Change-Id: I1f12434521d11f63c31a102bfbfaf923cb262965 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit d6ea619ac87a5ff9ed239b34a4c43a7e6fa141a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use __qt_internal_propagate_object_library to propagate object librariesAlexey Edelev2021-06-211-51/+4
| | | | | | | | | | | | Now that __qt_internal_propagate_object_library provides common way to link and propagate an object library it makes sense to reuse its functionality in the _qt_internal_propagate_qmlcache_object_lib function. Change-Id: I83faa3a7452f875982477930c584feae191cce27 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 5ca0e87cb08f4d78027ca201a92f8a2376c23a78) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-211-3/+3
| | | | | Change-Id: Ib0cbd6ad0c1b0118fcd5fee3de10a0334cc38f9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix some spelling errors in translated messages and commentsFriedemann Kleint2021-06-195-20/+20
| | | | | | | | Change-Id: I34869a9f6aa8cf0e4eadbd2fbeb6d6aca52f9ca7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 47b7bb33463cd45f6c67020d0c64f309010db1bb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Allow using an existing target as a backing targetAlexandru Croitor2021-06-181-5/+3
| | | | | | | | | | | | | | | | | | | | This was previously achieved by passing a NO_CREATE_BACKING_TARGET internal option to qt_internal_add_qml_module. Now it's just a conditional check to only create the backing target if it doesn't exist yet. This aligns with the behavior of the public qt_add_qml_module function. The old option is deprecated and will be removed once all repos mentioning it don't use it anymore. Amends cb293ee3afea3fe0cfabee58b4d34c278f17b709 Change-Id: Ifd478a5495b36c7ba127d4b8bea2ec1225035744 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit b627b4e51b6fb4f01e628021fc0367fe05347675) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't warn "interleaved frame-sync and actual events" if DA is nullShawn Rutledge2021-06-181-1/+2
| | | | | | | | | | | | | | Amends 1285b67a113cd2eb4fc03ec3e4ddd4dfdbe8ae76 It might turn out that this warning is just noise in other cases too; not sure. But it's quite normal that currentEventDeliveryAgent is null when the once-per-frame fake hover event occurs. Fixes: QTBUG-94576 Change-Id: Ib4eed274801b08b62403caec70d0fc3c538e4383 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 8a46606ee7b103100bb09d175ec296b521cf91c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Adjust QML plugin class name auto-computingAlexandru Croitor2021-06-182-11/+22
| | | | | | | | | | | | | | | | | | | | | | The recent 602d26c38f3767be9bec25302c93fc155c4dce59 change in qtbase is now requiring that CLASS_NAME is always set for qml plugins, to ensure that in static builds we can pre-build a plugin initializer object library. Split out the uri escaping and class name generation code into separate functions. Ensure that the class name is auto-generated by qt_internal_add_qml_plugin if it wasn't manually specified. Pass that value to the qt_internal_add_plugin function. Remove comment about not passing the CLASS_NAME. Task-number: QTBUG-93257 Task-number: QTBUG-92933 Change-Id: I8aa482a7da3a59f5a2213a630ff0be70506efe11 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-181-3/+3
| | | | | Change-Id: Iff225ec7a2cbf5f251ddbcd456741891927a789c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove old configure-related filesJoerg Bornemann2021-06-175-647/+0
| | | | | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Task-number: QTBUG-89536 Change-Id: I1c41256e773b0cdfdf237802d672b1140b076e99 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit ddcddbb48e5b7a275ef6e1e154d1367707815c6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add more links to QJSEngine's ownership documentationFabian Kosmale2021-06-171-1/+10
| | | | | | | | | | Also explictily mention again that objects with JS ownership won't be deleted as long as they have a parent. Change-Id: I1eeb5bc8183b6621f24f3751b8152b36acf2eeae Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 906ccb4694bbb3577efc8b8839ed687ebb3e3dce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmlcompiler: Fully support required propertiesMaximilian Goldstein2021-06-179-8/+146
| | | | | | | | | | | | Previously support of required properties was limited to detecting whether a property that was required actually exists. Now it also enables us to determine whether or not the required property was ever bound to. Still limited by the fact we do not fully support script bindings yet. Fixes: QTBUG-86755 Change-Id: I1abb921d3b4f86a7929f0f829b541088e0c2bf60 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 803a5fda05832b139cc1d76b666777491c708a96) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix conversion of entries to be added to QVariantListsUlf Hermann2021-06-175-4/+83
| | | | | | | | | We should pass the variants themselves, not their constData(). Fixes: QTBUG-94502 Change-Id: I92688348d7b46d74935dc11080b26290f5e8be86 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit dbe34dfa0d42510b804c898b77d6fe145473c31b)
* Avoid undefined behavior in the JITUlf Hermann2021-06-175-6/+10
| | | | | | | | | | | | We need to add an entry to all the RegisterID enums, so that we can mark a RegisterID as invalid. Task-number: QTBUG-94068 Change-Id: I5c13b271eade50fd63327612514ba7ebe33a5c39 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 636481a31110f1819efaf6500b25fbc395854311) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing palette property to QQuickWindowMitch Curtis2021-06-177-8/+341
| | | | | | | | | | This was forgotten in 1875ad7f92cad270cc5857d71096a4b46c27c562. Fixes: QTBUG-91365 Change-Id: I8dabf0e2a5a13f0db5feac5c03e3494948393cb7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 249db12b6020cc3a8f04841b1e28cd529f4929d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix QDoc warnings qtdeclarativeNico Vertriest2021-06-172-0/+9
| | | | | | | Change-Id: Ib53e0bc6e30440a5e2c84a0f37bc6cb0e424b821 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 733bb4366e6a59dcfd7be0b33e1ac885eb76e13c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-06-171-3/+3
| | | | | Change-Id: I39dd330af2d05967d1ef531dd2f57747baee18da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add RESOURCES argument to qt_add_qml_moduleUlf Hermann2021-06-162-5/+11
| | | | | | | | | | | | This way you can pass QML-related resources without triggering a warning. Change-Id: I4b7db5007f1f2ecf0eb556bc4e5bc67f8ac9148d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 0b7d6fe82fc1a5bcd8a033ff4d0c80dbdc40a070) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Install .qml files from source dir and honor their resource aliasCraig Scott2021-06-162-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | For targets that are built as part of Qt, we currently require all .qml files to be passed to qt_internal_add_qml_module(). We can use that to iterate over the set of qml files and access their source file properties at configure time. The previous approach tried to use the list obtained at generate time, but the source file properties (and therefore their resource aliases) were not accessible and the install locations assumed no resource path or alias. By installing from the source dir, we also address the dependency issue where an install wouldn't cause the build dir copies to be updated. The install target will always install the latest source files with this change. Fixes: QTBUG-94519 Fixes: QTBUG-94520 Change-Id: I6a97a9631ff77c3f7696899a347b83c2eb4b0ca4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d8b3becc79a8d352d935c33084d29fc2bc088ea8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Remove compatibility functionsAlexandru Croitor2021-06-161-11/+0
| | | | | | | | | | | | | | | | | All our qt5.git repos are marked with QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS There are still some marketplace repos like quicktreeview that don't have it, but those should be fixed separately. The point is we don't want to override the public qt_add_qml_module function with the compatibility one. Change-Id: I7959025acbf30ac94b6c20799089996a66c06fc2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit c5743097fd8f26eaad13e0b97cac8e7168d08d11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid UB in qjsnumbercoercion.hUlf Hermann2021-06-161-1/+5
| | | | | | | | | | We need to check for NaN before casting a double to an integer. Task-number: QTBUG-94068 Change-Id: Ib7bfab5ab2e24af950c8f8d7b32c7d411bd8cb71 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c3b0f8756aee5cc9d965a641088390fff0fed459) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 08:19:23 +0000