aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.3' in qt/qtdeclarativeQt Submodule Update Bot2022-02-211-5/+5
| | | | | Change-Id: I50599035acc7f043c932c5d7a395104484e55f84 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* MessageDialog: use QQuickDialog::implicitFooterHeight for implicitHeightOliver Eftevaag2022-02-215-5/+5
| | | | | | | | | | | | Using the dialog implicitFooterWidth in the implicitWidth binding is causing an infinite loop. But using the implicitFooterHeight for the implicitHeight binding is not causing any issues what so ever. Task-number: QTBUG-99103 Change-Id: I6ba70bc9871d956e3ccd54662139dd1698d656ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 0c4610b58ee957180952c79c18c41ba6377b1fa4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qmltc_examples: Fix a documentation leftover (FILES -> QML_FILES)Andrei Golubev2022-02-211-2/+2
| | | | | | | | | Amends 97123dbe6755a787e93797f717f8ebf193352b85 Change-Id: I0f13df4abff4ba2f0bb066480a157f6cfbefa3c2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit bd968fa6ff07cda5d96dd5c9851bb1c98ee4f318) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlCompiler: Perform QVariant conversion in JavaScript semanticsUlf Hermann2022-02-216-58/+148
| | | | | | | | | | | | | In JavaScript we have a number of extra conversions not covered by qvariant_cast. Therefore, add a method to perform a QVariant conversion in JavaScript semantics to QJSEngine, and use that in the compiler. Fixes: QTBUG-100883 Change-Id: I8b0bfa0974bc6b339d2601fb373859bc710788c8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> (cherry picked from commit d0f4e0c037cf61eb5bb559755ee7c9ce6cf6b7dc)
* QmlCompiler: Do not crash on attempts to lookup a function in the scopeUlf Hermann2022-02-214-1/+25
| | | | | | | | | | Rather, reject the code and let the engine handle it. Fixes: QTBUG-100980 Change-Id: Ibcd1249ba3550b40121622752b4ca22d1df3ed2a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> (cherry picked from commit 69fefd94e8b0ec2aa379d0b75ccaa2c58e3f0933)
* QmlCompiler: Do not generate block comments into C++ codeUlf Hermann2022-02-214-9/+24
| | | | | | | | | | | | The code we're commenting could again contain block comments. You cannot nest them. Fixes: QTBUG-100978 Change-Id: I78685bf29dd30f05e5a3b17abc43ba0b4cb6849e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit 795d7dafe5be5cd48aa8225a1343285b3aca2be7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlCompiler: Avoid infinite loop in dead store eliminationUlf Hermann2022-02-214-3/+21
| | | | | | | | | | | We have to mark the required variables also in block 0. And we shouldn't generate empty blocks. Fixes: QTBUG-101011 Change-Id: I0dd19f69f45f507cb83e2ddfba3060de48a940b4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 88147eb3f621e7d972410698d6edca16493d7c66) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Un-blacklist tst_QQuickFramebufferObject: skip offscreen/software renderingShawn Rutledge2022-02-192-8/+9
| | | | | | | | Task-number: QTBUG-65614 Change-Id: I31e2a61e3b2df2432042c8b6028df63cc9cb8d22 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 8fb4fb6d014ba4bbaa7f7d22998cfda4ea5e9855) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickIcon: Resolve source URL relative to outermost property ownerYuya Nishihara2022-02-198-24/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original attempt, deb238586a "QQuickIcon: Resolve URL relative to current element," works fine for IconLabel itself, but not for Buttons containing IconLabel. // <style>/Button.qml T.Button { id: control icon: // owner: control contentItem: IconLabel { icon: control.icon // owner: this, but should be control } } // user code Button { icon.source: "a.png" } Since IconLabel is an implementation detail of the Button, IconLabel.icon owner needs to point to the Button so the user-specified icon.source can be resolved relative to the user code, not to the <style>/ directory. This patch fixes the problem by explicitly resolving the source URL on setIcon() and propagating the resolved icon object to the inner items. If the relative URL has already been resolved by e.g. Button, the inner IconLabel never resolves the URL again to itself. The problem could be addressed by initializing icon owner only once by Action/Button constructor, but that would lead to dangling owner pointer as icon object could be copied anywhere. So I've added resolvedSource data member in place of the owner pointer. Button { id: dangling } Button { id: victim; icon: dangling.icon } // owner: dangling Component.onCompleted: dangling.destroy() // ... would SEGV (or use after free) if victim.icon.source modified. Fixes: QTBUG-95587 Change-Id: Ibdd07118e79f1e1f36e1faea0289150eca734e27 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit dfc16e40ab43e8062b93c566e4316efe4d4f10a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlCompiler: Correctly encode inf/nan/-0 into C++Ulf Hermann2022-02-184-0/+46
| | | | | | | | | Fixes: QTBUG-100947 Change-Id: If0b05adac91f687daf697f3510e4cf48e7de4537 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4c716dd19cf88349acc33eddae28c4e9222a3800) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Turn notes into section in QQuickWidget overviewKai Köhne2022-02-182-7/+13
| | | | | | | | | | | The extensive use of notes in overview documentation should be avoided. All the notes are concerned with performance considerations, so let's group them together in one section. Change-Id: I4854e078e35190726091b2ef6b7a674abda8b3b7 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 64f09b80146340d7eac87b51e1c292e69730b21f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove cmake-variables qdoc groupKai Köhne2022-02-181-1/+0
| | | | | | | | | The group is not used anymore. Change-Id: Ieebee205f10e5b96ed7cdc1a45b6a7d34d35fa26 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 30687a3c338ba316b7171bf8cea0d94beb6c482b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix copyright header of Calendar QML typesMitch Curtis2022-02-173-6/+6
| | | | | | | | | They're in Qt Quick Controls 2, not Qt Quick Templates 2. Change-Id: I6199c695eadb5424885a6f0e1a25e584de4178a7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 4df79aa9dbb0b750b9b60f145e39321f48294422) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qmltc_examples: Set visible text to 0 by defaultAndrei Golubev2022-02-161-0/+1
| | | | | | | | | This gives slightly nicer initial UI as a result Change-Id: I112ed029d3735b7c960b7723d2aef0b6fc8e1777 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f6b039681a3060098cadc57cd64fbf7d9705b6ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable qmljs on iOS buildJuha Vuolle2022-02-161-1/+1
| | | | | | | | | | | | When compiling for iOS the linking of qmljs tool fails with: Undefined symbols for architecture arm64 "_qt_main_wrapper" Fixes: QTBUG-100855 Change-Id: I25a3ca9fd9d5efd2d6906087f1580b2679e6745f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f3536a202ea124c91dc1ab53bd5c40cdb9b693e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix tst_quicktestmainwithsetup on AndroidAssam Boudjelthia2022-02-161-0/+5
| | | | | | | | | | | Include imports into the test resources because they might be needed by the test as well. Task-number: QTBUG-97056 Change-Id: If2e0425bdc11024fb2f49c7fe4d6d62f6422f401 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit d736e9a601e6fa03d164e741998627680aa8bf44) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickTableView: don't position the table contents outside the viewportRichard Moe Gustavsen2022-02-163-55/+219
| | | | | | | | | | | | | | | | | | | | If you call positionViewAtCell(row, Qt.AlignTop) for the last row in the table, the row will be aligned to the top of the view, as requested. But this looks really wrong , since it will cause the table to be flicked to a position that causes it to overshoot by a distance close to the height of the whole view, effectively leaving a big empty gap at the bottom. This looks really buggy. This patch will correct this behavior by ensuring that we never flick the table to an "invalid" position while positioning table at a cell using the requested alignment. Instead we clamp the table to the edges of the viewport. Fixes: QTBUG-100680 Change-Id: Id3003df784a0128df28ee2e78e2456e1fa1e11e8 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit c3d909ec286962c507e346a8d490b905cdd266f8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdeclarativeQt Submodule Update Bot2022-02-161-5/+5
| | | | | Change-Id: I241e56103fbfde382ded48dff4182d7b63dd51c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Rename QT_QML_MODULE_FOLLOW_FOREIGN_VERSIONING to be internalAlexandru Croitor2022-02-161-2/+3
| | | | | | | | | | | | | | Rename it to _qt_qml_module_follow_foreign_versioning to make it more clear it's an internal property. Amends 9cd3191d4eb42dbf7847ffccb178fe5402968464 Fixes: QTBUG-100213 Change-Id: I7e6c45800e9e68d5837b906bf349a58330892f86 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d7d6c0d13c415b71aeab1f8cc95b22a3fcb79d5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix docs and implementation of qt_generate_foreign_qml_typesAlexandru Croitor2022-02-164-19/+38
| | | | | | | | | | | | | | | | | | | | | | | Renamed doc file not to contain the version number like the rest of the doc files. Clarified description of what the function does. Adjusted doc page title and contents of the function. Fixed synopsis. Added Technical Preview note. Renamed function arguments for clarity. Fixed incorrect COMMENT and DEPENDS target usage. Added mention to QmlIntegration and qt_generate_foreign_qml_types on the Qml module page. Amends 96c1337aef41694c1af4863ad6f0d4d1f961363a Amends 3b1ae2f598d6013e5d262262002820d6eb76805b Fixes: QTBUG-100216 Change-Id: I5c48616a7836c4ddb3f5ca36b7e82f1364995f2f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 9e03505902ee7bda802f18ad1a34d36f96838985) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Document source file propertiesAlexandru Croitor2022-02-161-0/+187
| | | | | | | | | Task-number: QTBUG-100224 Change-Id: I548e0317f148cdedafd553a3591526c40b9b3a32 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d280b41a096c470bcdc573fb8268aa128e0b7c3b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QSGRendererInterface::OpenGL in documentation and examplesKai Köhne2022-02-1613-14/+14
| | | | | | | | | | | | QSGRendererInterface::OpenGLRhi is only an (undocumented) alias to ...::OpenGL, so let's use that instead. Amends 0b2311a62b25c Change-Id: I4acdd39dc1d9b75bed5c474667a43b4ad86e7f47 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit e2138561df3562c19000af24d43659090c19167a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add documentation for ComboBox::valueAt()Kai Köhne2022-02-161-1/+10
| | | | | | | | Fixes: QTBUG-100380 Change-Id: I03d99ef05577bfce7c6a39ed5bfdecac33ce7911 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 3bb7cf64994c3b43243b6d000d051f99fdaae03e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmlcompiler: include necessary headers in generated codeFabian Kosmale2022-02-161-0/+2
| | | | | | | | | | | The generated code currently relies on transitive includes. Avoid potential issues in the future by including the necessary headers directly. Change-Id: I6b523d9c2cabef00bf182d139f8a0e8611d6bb9e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 99f8e0b2f31c455c42ae4a5e09a7c5467a71fadc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document that all required types must be implemented by custom stylesMitch Curtis2022-02-161-0/+8
| | | | | | | | | | | | For example, it's not possible to customize only ScrollBar and have ScrollView pick those changes up automatically; you must also implement ScrollBar. Task-number: QTBUG-99367 Change-Id: Ie487b0b947fa936e56b5d8e473fbb66287b51c68 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit ce271b1bdf255059f5cc2efe62042508498d1ffa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QML warning in tst_QQuickListViewMitch Curtis2022-02-161-1/+1
| | | | | | | | | | The warning was about the delegate's parent being null in QTBUG_48044_currentItemNotVisibleAfterTransition. Change-Id: I54198b26adea137d539f71c8aebc1ba3a18d1e97 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit e523f00974eeccec4525edf85c732659a9c16119) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQmlStrongJSQObjectReference: rename setObject() argument o → objMarc Mutz2022-02-151-5/+5
| | | | | | | | | It shadowed a member of *this (QQmlGuardImpl::o). Change-Id: Ibb4175c27c240102efa86d34b5a822ea70a3a4c3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 88b2a368dcb3e84c762143307d2af90a5314b419) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickFontLoader: replace a QVector with QDuplicateTrackerMarc Mutz2022-02-151-7/+5
| | | | | | | | | | | Apart from a more fitting, minimal, API, QDuplicateTracker also transparently uses C++17 pmr::monotonic_buffer_resource to avoid, or at least reduce, memory allocations. Change-Id: I75a065e67dadf057450f821e2df75609fb616449 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit fac0991aa33c1b22802e6dc4a8eb66dd6baf4de9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Imagine: Use 16 pixels of margin, rather than 20 (for consistency)Oliver Eftevaag2022-02-152-9/+12
| | | | | | | | | | | | | | | Other imagine style dialogs use 16 pixel for the left and right margins, for the footer. But for some reason, the font and message dialog used 20 pixels. I included some padding for the message dialog "detailed text area" as well, to make it prettier. As well as some margin between the buttons and the detailed text. Change-Id: I3911b13fb8b3d9f117673cdb20a3e5ff5a1edcac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 3412b750dab2534c03b9f9d86c3a287705fe3332) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Error out when using CMake < 3.19 with qml app deploymentAlexandru Croitor2022-02-155-1/+27
| | | | | | | | | | | | | | | | | | | App qml deployment fails at install time when using CMake < 3.19 because the _qt_internal_generate_deploy_qml_imports_script finalizer is not executed. It is not executed because the Qml dependency is added later than qt_add_executable, and qt_add_executable immediately finalizes with a lower CMake version. We can detect this situation and issue a warning to the user that they should manually finalize their target in that case. Adjust documentation to mention that. Task-number: QTBUG-98545 Change-Id: I862b2fad35c8128dbb043cea972c8e36958308f4 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 0d276381135ed5724464cb784f3d17775ac4d764) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmltc: Explicitly unsupport singleton typesAndrei Golubev2022-02-144-25/+25
| | | | | | | Change-Id: I05525f884f239c954527f24ad8842b108b32aff1 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> (cherry picked from commit 121457933dfa40de188063fefe86fa78881e18cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Appreciate pragma singleton in QQmlJSImportVisitor in Qt 6.3Andrei Golubev2022-02-144-3/+15
| | | | | | | | | | | Partial cherry-pick of dc9de38abe797e835480171a047bf96e98c84e1f This should help qmltc to reject singleton types in a user-friendly manner, without compromising qmllint in 6.3 Task-number: QTBUG-98558 Change-Id: I2c9def171e36ca50d3f3d26b093bca6d376621ed Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Avoid spurious dependency on qml_compile_hash_p.hFabian Kosmale2022-02-142-2/+2
| | | | | | | | | | | | | The compile hash changes on every commit, so including it in a central header like qv4compileddata_p.h would cause many spurious rebuilds. As we only needed it there for a static assert, we can simply move that check into a source file. Change-Id: I9f24cb3faf5172023b0ece9e6aa07db02638c8be Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 28b32ae449913d079f220110ffa90de9a9ee9784) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Skip qml compile hash recreation in developer buildsAlexandru Croitor2022-02-141-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation favors recreation of the hash whenever the git tree hash is changed and a cmake reconfiguration is forcibly done by the developer. This causes a rebuild of the Qml library. This dependency tracking is too coarse and not very helpful. A developer that doesn't touch the Qml library sources will be confused why a commit rebuilds the library. A developer that does touch the Qml library will be confused why the qml hash hasn't changed after running ninja, and even more confused when it is changed after a commit and reconfigure. To improve the situation a bit, the build system will now not recreate the hash when doing a developer build and the developer will be expected to remove the already existing hash file when necessary. This will not cause issues in our CI developer build configurations where cache files are not removed. Even though the cache files are not removed, the qtdeclarative build directory will be clean, which means the qml hash file will not be present and will be created with up-to-date content, thus invalidating all cache files. Change-Id: I809b2cffbc5bb2b09af4fb712c7e46a743bfd333 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 09aecb0d7762010249ef8f78ef92367b73a4a1e8)
* Restore comment describing how the compile hash worksUlf Hermann2022-02-141-1/+5
| | | | | | | | | | This is really useful information and had to be painstakingly re-discovered. Task-number: QTBUG-99608 Change-Id: I21f7fc56745c9fb979f61710bebd8ad83e702cc4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 0aa6cafe81eb5cc80461e396751da81bb1db95b3)
* Fix tst_designer and tst_qquickfontdialogimpl tests on AndroidAssam Boudjelthia2022-02-142-0/+8
| | | | | | | | | | | | | These QML files are needed for androiddeployqt to be able to package the QML modules because they're not imported in a normal fashion under a QML file but rather implicitly inside the test cases. Task-number: QTBUG-97056 Change-Id: I792462e88a2d8ca43747cffc050fe60987f90ecd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 98fe8834faaaed65c6c162d0cd2af5609caf14f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix issue with Xcode common dep between qmllint and toolingAlexandru Croitor2022-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes when using the Xcode generator and there 2 or more Qml modules added in different subdirectories, you get an error like CMake Error in Bar/CMakeLists.txt: The custom command generating build_dir/Bar/B.qml is attached to multiple targets: Bar_qmllint Bar_tooling but none of these is a common dependency of the other(s). This is not allowed by the Xcode "new build system". The main reason for the error is that we accidentally make the _qmllint target depend on the qml files that are supposed to be copied by the _tooling target to the build dir, instead of making qmllint depend on the source files. The qmllint target queries the QT_QML_LINT_FILES property with a generator expression, but the values are relative qml file paths. Within the context of add_custom_command they evaluate to the build dir qml files that are copied by the _tooling target. To avoid the issue, ensure that QT_QML_LINT_FILES contains absolute paths to the qml files. This way it will not depend the output of the _tooling target and avoid the Xcode issue. It is not clear why the issue does not trigger when there is only one qml module in the project. But the fix applies nevertheless. Resembles 1bd0a5ce02352a600367beb5a5421c8f8332e1fe Task-number: QTBUG-95763 Fixes: QTBUG-100307 Change-Id: Ie3af503635de3ca61ce5975dcd0983d4e19f259f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> (cherry picked from commit ea7024ef7bcae60c26d0470abb2ffeb56cac1875) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Clarify doc comment about Xcode common dependency issueAlexandru Croitor2022-02-121-2/+4
| | | | | | | | | | | | | The comment made it sound like ${target} depends on ${target}_qmltyperegistration, but it's the other way around. Amends 1bd0a5ce02352a600367beb5a5421c8f8332e1fe Task-number: QTBUG-95763 Change-Id: I15e89395bee9d9ce88fa4d31901dafc4b956e99b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit f608b4143e09875bf0bc04a820ca013b959905b9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix incorrect option passed to qt_deploy_qml_imports in docsAlexandru Croitor2022-02-121-3/+1
| | | | | | | | | | | It was copy-pasted from the example doc snippet for qt_deploy_runtime_dependencies. The actual option is TARGET, not EXECUTABLE. Change-Id: I91fb2fdf069588c4a81e00db5f65fe19150fe8b6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 0605069fae85f95b3847ce1aeefb43bef1b9cd1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qqmlqt: reliably call QDesktopServices::unsetUrlHandler()Marc Mutz2022-02-121-7/+8
| | | | | | | | | | Use QScopeGuard instead of manual calls, so even a failed test will properly clean up after itself. Change-Id: I321f3560557e58b16cd177c623cb78b5b25111a7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 94c63a7f1236e764fcc8514ab17c993ee1e9aec7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Mark QQuickRenderControl constructor explicitShawn Rutledge2022-02-121-1/+1
| | | | | | | Change-Id: I2adfaa21e5bb446a5ee373f70c3b16c103f4878d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 75ab7d8a5eae881d7443fdb79d684aa14509a6a8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add 6.3 revision to failOnWarningShawn Rutledge2022-02-121-1/+1
| | | | | | | | | Amends ab287508d56a6735fc877ff0efa8da517e849ac3 Change-Id: Ia9fb0e10b516d1541b6356557c11051e918a307d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 1cc8bd000b6e05fdb2d950d5425e1af52bcf9138) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: State Qt versions for when CMake commands etc. were introducedJoerg Bornemann2022-02-125-0/+8
| | | | | | | | Task-number: QTBUG-100212 Change-Id: Iaba78e26d9dcaf85e6089639ef95385ad36891f5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0a28ee11e398ac8947cf6e5699bddc65769e91de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Record deferred and immediate names of anonymous types in qmltypesAndrei Golubev2022-02-121-17/+17
| | | | | | | | | | Anonymous types can have deferred properties. For instance, a type of a group property might come from C++ (marked with QML_ANONYMOUS) Change-Id: I8e372d5c05d3da2ca86fdb084d730c98c24331f5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit ce942b2cbd97c82bf6e60e936e5f1601994b6d17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Extend tests for DeferredPropertyNamesAndrei Golubev2022-02-121-0/+77
| | | | | | | | | Document some extra behavior details through tests Change-Id: Id05da7983406a0a61e78496a8e6483e10a7c38d1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 4d98aa998eceb53ce616e9111553b8fdc5fad906) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdeclarativev6.3.0-beta2Qt Submodule Update Bot2022-02-111-5/+5
| | | | | Change-Id: Id43f28ed0aea3a2ae59a4ee6e0ad2d43f6f2fb23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* TreeViewDelegate: allow app to add custom pointer handlersRichard Moe Gustavsen2022-02-103-6/+69
| | | | | | | | | | | | | | | As it stood, it was not possible to add custom pointer handlers to a TreeViewDelegate, to e.g do an expandRecursive() if using the right mouse button, or holding down ctrl during a click. This patch will change this, so that we only perform the default collapse/expand operations when using a plain left (double) click, and ignore the event otherwise. Change-Id: Ifbdf0903158b65c50d0e36e98ab7e48efaa3e3ab Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 2014101583b89128960f645e57192d1d475767e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable failing declarative tests on AndroidAssam Boudjelthia2022-02-1017-3/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to enable testing on declarative for the module as a whole and have some sort of test verification for the mean time, and fix the fails over time. Task-number: QTBUG-100003 Task-number: QTBUG-100014 Task-number: QTBUG-100016 Task-number: QTBUG-100018 Task-number: QTBUG-100020 Task-number: QTBUG-100021 Task-number: QTBUG-100164 Task-number: QTBUG-100166 Task-number: QTBUG-100167 Task-number: QTBUG-100169 Task-number: QTBUG-100171 Task-number: QTBUG-100173 Task-number: QTBUG-100175 Task-number: QTBUG-100176 Task-number: QTBUG-100177 Task-number: QTBUG-100191 Task-number: QTBUG-100253 Task-number: QTBUG-100254 Task-number: QTBUG-100256 Task-number: QTBUG-100257 Task-number: QTBUG-100258 Change-Id: I85bf1501b94f04853a1ca715e35df0a56041308a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f22d884faff5f68230981fc191527c67aeb8a18f) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix tst_controls missing resourcesAssam Boudjelthia2022-02-098-4/+40
| | | | | | | | | | | | | | bundle all data resources and make sure all imports and bundled. Add dummy.qml files which are needed for androiddeployqt to be able to package the QML modules because they're not imported in a normal fashion under a QML file but rather implicitly inside the test cases. Task-numer: QTBUG-97056 Change-Id: I8be72c06994cc7bd90fb176a19bf69142b225fd1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b6413335b0a977e5c7218c4d74fb090fa11bf52e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use the new QHoverEvent ctor taking globalPosShawn Rutledge2022-02-092-11/+13
| | | | | | | | | | | We want to give globalPos to every pointer event ctor in general, to avoid bad assumptions. Task-number: QTBUG-100324 Change-Id: I8f744d4f01aec9e860b625a77b258237539deab6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 334aea0aa14eac90a6ff77aad120d76ed0fad372) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 10:53:44 +0000