qt/qtdeclarative.git, branch v6.4.0 Qt Declarative (Quick 2) Update dependencies on '6.4.0' in qt/qtdeclarative 2022-09-23T07:21:46+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2022-09-23T07:21:41+00:00 0c0f33b73e3259dbf35481d3f1ffb81a97b76190 Change-Id: Ic8d36132f6fc1df0a6c6f2f54852525c9675c2dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: Ic8d36132f6fc1df0a6c6f2f54852525c9675c2dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Update dependencies on '6.4.0' in qt/qtdeclarative 2022-09-20T03:31:34+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2022-09-20T03:31:29+00:00 e31a5f82f1b095c154cdade5e87f6b75a841159e Change-Id: Ib418c3f52b60f831ec0d7c3f70bc79426a9ec758 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: Ib418c3f52b60f831ec0d7c3f70bc79426a9ec758
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Update dependencies on '6.4.0' in qt/qtdeclarative 2022-09-13T03:31:16+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2022-09-13T03:31:10+00:00 aab9ac1fb8d62dcf9dad158b7a36745086417af6 Change-Id: Ideb64d5c0ca50382a570d31a662584dd884b2f8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: Ideb64d5c0ca50382a570d31a662584dd884b2f8c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Controls: add todolist example for showcasing the iOS Style 2022-09-12T11:40:02+00:00 Jenny Lofthus jenny.lofthus@qt.io 2022-07-26T12:25:47+00:00 22849f93d860638a02200e68afb499d539f6017e Task-number: QTBUG-80261 Change-Id: Ie6d86b0a49bd0684373816d709c7e010aff7e7a5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6b5cf5969889a88d5f506692c859d1bd4f59d5dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Task-number: QTBUG-80261
Change-Id: Ie6d86b0a49bd0684373816d709c7e010aff7e7a5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6b5cf5969889a88d5f506692c859d1bd4f59d5dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Update dependencies on '6.4.0' in qt/qtdeclarative 2022-09-12T05:20:25+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2022-09-12T03:44:33+00:00 4a5d76e0d79848ccaae6e3cd8287ac05a970c15a Change-Id: I43844f70609c2823191215e6a11ac6e160958f7b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: I43844f70609c2823191215e6a11ac6e160958f7b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Use --bare option in CMake-generated calls to QML tools 2022-09-12T05:19:36+00:00 Ulf Hermann ulf.hermann@qt.io 2022-09-08T14:27:24+00:00 fecd60e62d9b9c4179dda277591f5628432c0216 We pass the system import path(s) explicitly. We don't want the tools to guess them. Pick-to: 6.4 dev Task-number: QTBUG-106365 Change-Id: I529d5e79fa0331e6994be0d8a659d4a4556be1dd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> 
We pass the system import path(s) explicitly. We don't want the tools to
guess them.

Pick-to: 6.4 dev
Task-number: QTBUG-106365
Change-Id: I529d5e79fa0331e6994be0d8a659d4a4556be1dd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Avoid dangling pointers in handler for QQuickPixmapReply::finished 2022-09-11T15:48:42+00:00 Shawn Rutledge shawn.rutledge@qt.io 2022-09-07T15:58:08+00:00 c5e7d26580377175cb9129d575b9c24eea1c6d71 Fixes: QTBUG-106357 Change-Id: I78156b403618c88da26d381be7a6e777a6d22f87 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 88aff6f851a70e5bb5082b04943a5c8ddf026d44) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Fixes: QTBUG-106357
Change-Id: I78156b403618c88da26d381be7a6e777a6d22f87
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 88aff6f851a70e5bb5082b04943a5c8ddf026d44)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Add --bare option to qmltc and qmlcachegen 2022-09-11T15:48:35+00:00 Ulf Hermann ulf.hermann@qt.io 2022-09-08T14:18:34+00:00 21aac7612477ada4c4b360681541312a98cfacfc We need those to prevent usage of the host Qt's import path when building QML files for the target. Task-number: QTBUG-106365 Change-Id: I34499af850fb759603206cb429ff97633c76054d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2f583eeab254edbb0e1b42213e9d48ce6ad3f04e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
We need those to prevent usage of the host Qt's import path when
building QML files for the target.

Task-number: QTBUG-106365
Change-Id: I34499af850fb759603206cb429ff97633c76054d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2f583eeab254edbb0e1b42213e9d48ce6ad3f04e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
CMake: Partially unify tooling import path handling 2022-09-10T16:50:27+00:00 Alexandru Croitor alexandru.croitor@qt.io 2022-09-08T13:55:09+00:00 8148b3c04bc68c6c4d4b8e7bb6a6ba9e362967de Add a function that returns all Qt import paths. It's intended to be used to pass the import paths to the various tooling invocations like qmlsc, qmltc, qmlimportscanner, qmllint, qmlcachegen. The order of the Qt prefixes returned is: - The build dir of the currently built qt repo (e.g qtdeclarative/qml) - Additional paths specified via _qt_additional_packages_prefix_paths - The main Qt installation prefix QT6_INSTALL_PREFIX Use this function for the various tooling invocations. Make sure the paths are only added if they exist on the file system, otherwise some of the tools might complain about non-existent paths, for example qmlimportscanner. This is only a partial unification, because we should still figure out how unify all the various target specific properties like QT_QML_IMPORT_PATH and QT_QML_MODULE_OUTPUT_DIRECTORY as well as the differences where in certain places the paths are specified via genexes like $<TARGET_PROPERTY:${target},BINARY_DIR> and _qt_internal_genex_getjoinedproperty and qmlcachegen custom import path computation done in qt6_target_qml_sources. Task-number: QTBUG-106365 Change-Id: Ia1297ebd57764068a4b8fbcb5ac70df6b380d3f6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 3a35b57269519bfed2418e27ed9daf69f27576a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Add a function that returns all Qt import paths. It's intended
to be used to pass the import paths to the various tooling invocations
like qmlsc, qmltc, qmlimportscanner, qmllint, qmlcachegen.

The order of the Qt prefixes returned is:
- The build dir of the currently built qt repo (e.g qtdeclarative/qml)
- Additional paths specified via  _qt_additional_packages_prefix_paths
- The main Qt installation prefix QT6_INSTALL_PREFIX

Use this function for the various tooling invocations.

Make sure the paths are only added if they exist on the file system,
otherwise some of the tools might complain about non-existent paths,
for example qmlimportscanner.

This is only a partial unification, because we should still figure out
how unify all the various target specific properties like
QT_QML_IMPORT_PATH and QT_QML_MODULE_OUTPUT_DIRECTORY as well as the
differences where in certain places the paths are specified via
genexes like $<TARGET_PROPERTY:${target},BINARY_DIR> and
_qt_internal_genex_getjoinedproperty
and qmlcachegen custom import path computation done in
qt6_target_qml_sources.

Task-number: QTBUG-106365
Change-Id: Ia1297ebd57764068a4b8fbcb5ac70df6b380d3f6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 3a35b57269519bfed2418e27ed9daf69f27576a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
CMake: Correctly process root paths for qmlimportscanner 2022-09-10T16:50:24+00:00 Alexandru Croitor alexandru.croitor@qt.io 2022-09-08T13:13:26+00:00 121107c01d03107bd11b44724f461d3f455012b2 The values in _qt_additional_packages_prefix_paths end in /lib/cmake, because they are prefix paths, not root paths. Adding ./qml to the end of those paths would never result in valid qml import path locations on disk. Use __qt_internal_prefix_paths_to_roots from the Qt6 package to strip away that suffix, before adding ./qml. This should fix the Conan multiple root paths case, as well as builds of ExternalProject examples during a prefix build of qtdeclarative. Note that the examples will still not run without setting the QML_IMPORT_PATH env variable to point to the qtdeclarative/qml build directory, or creating a qt.conf file in the example build dir that sets the qml import path to the qtdeclarative build dir. Amends 8bf916bfcbd5a05ec7370179317cd6d3a7dbd905 Fixes: QTBUG-106431 Task-number: QTBUG-96232 Task-number: QTBUG-102339 Change-Id: I6d3dd2b82634efc0faf756d884816dfb8a6ff4b6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 727151e0e03b0b91e1dc83c205a8608d5d5c236b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
The values in _qt_additional_packages_prefix_paths end in /lib/cmake,
because they are prefix paths, not root paths.
Adding ./qml to the end of those paths would never result in valid qml
import path locations on disk.

Use __qt_internal_prefix_paths_to_roots from the Qt6 package to strip
away that suffix, before adding ./qml.

This should fix the Conan multiple root paths case, as well as
builds of ExternalProject examples during a prefix build of
qtdeclarative.

Note that the examples will still not run without setting the
QML_IMPORT_PATH env variable to point to the qtdeclarative/qml
build directory, or creating a qt.conf file in the example build dir
that sets the qml import path to the qtdeclarative build dir.

Amends 8bf916bfcbd5a05ec7370179317cd6d3a7dbd905

Fixes: QTBUG-106431
Task-number: QTBUG-96232
Task-number: QTBUG-102339
Change-Id: I6d3dd2b82634efc0faf756d884816dfb8a6ff4b6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 727151e0e03b0b91e1dc83c205a8608d5d5c236b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>