aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3.0' in qt/qtdeclarativev6.3.0Qt Submodule Update Bot2022-04-051-5/+5
| | | | | Change-Id: I3f301d84e630404f076d1c505af987fe686ab64b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickMouseArea: let MouseArea reject hover eventsRichard Moe Gustavsen2022-04-053-33/+14
| | | | | | | | | | | | | | | | From testing Qt 6.1, a MouseArea should not accept hover events, and as such, block hover events from propagating. This patch will make sure that QQuickMouseArea rejects hover events, and thereby restore the behavior Qt had up till Qt 6.1. Fixes: QTBUG-95726 Fixes: QTBUG-95398 Change-Id: I1b929092a3004dd47ef1b6d1a957837ccedc7390 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 56a075341514db1242a0852ccf0fbe98e1fcabbc) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* QQuickControl: let Control reject hover eventsRichard Moe Gustavsen2022-04-057-5/+319
| | | | | | | | | | | | | | | | | | | From testing Qt 6.1, a Control should not accept hover events, and as such, block hover events from propagating. This patch will make sure that QQuickControl rejects hover events, and thereby restore the behavior Qt had up till Qt 6.1. Fixes: QTBUG-101394 Fixes: QTBUG-100543 Fixes: QTBUG-100149 Fixes: QTBUG-98940 Fixes: QTBUG-98850 Fixes: QTBUG-95398 Change-Id: I2df9d0f9999ce074cab0c64accad9172b411fb63 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 0c7b0a43064c8be452f4be74701f1dabce87f24c) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Define variables also for conversion registersUlf Hermann2022-04-054-14/+47
| | | | | | | | | | | The previous code relies on any jump-induced conversion types to also show up somewhere else. This does not apply to dev because the register variables have been re-organized there. Pick-to: 6.2 6.3 Fixes: QTBUG-102273 Change-Id: I7723ff3b4992cecc38ce531e76494874910dfaea Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Add Qt Quick Widgets module landing pageAndreas Eliasson2022-04-051-0/+80
| | | | | | | | Fixes: QTBUG-101964 Change-Id: Id088bdeff8d266eee0ba241097e8c9d8e1f338fe Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 4ace8a4cfb6011c6701674edd0288fc989483481) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickDeliverAgent: don't propagate hover to siblingsRichard Moe Gustavsen2022-04-035-12/+109
| | | | | | | | | | | | | | From testing Qt 6.1, hover events should not propagate between siblings. As soon as a leaf item is found that receives a hover events, the event should only propagate up the parent chain starting from the leaf item. Change-Id: I7448f5322f529addb2260b0ee2b02d2cfadb55e1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 499828b855d125ac236917f6ed01d8f1e7d88505) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: Improve cursorPosition description in TextInput and TextEdit docsJaishree Vyas2022-04-012-2/+23
| | | | | | | | | | | Fixes: QTBUG-97169 Change-Id: I060be767dd980c489d8e5426d67f2e8b6d21e96c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ivan Tkachenko <me@ratijas.tk> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 79807f37b5e9e9744fdaf7af380fd7bfb7ed85f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix Application type docsJaishree Vyas2022-04-011-4/+4
| | | | | | | | | | Task-number: QTBUG-101149 Change-Id: Ie166665d1c094215a2dc528cfd890cbc6f29a621 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 36568b06822fd25c72ee4a23b1822bbc0fcb2721) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlCompiler: Fix a number of warts regarding type lookupUlf Hermann2022-03-259-5/+96
| | | | | | | | | | | There was a condition missing in qqml.cpp making most type lookups crash right away. Furthermore, we need to generate code for type lookups we do need. Fixes: QTBUG-102019 Change-Id: I34e9de7686528b39a35e59c616e4e28b32a6e031 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5901fba81195ed725ffd7ad6c278e44f41b6df6f)
* QML: In captureLookup(), return false if it failsUlf Hermann2022-03-251-2/+1
| | | | | | | | | | | | Otherwise the AOT-compiled code will assume the capture succeeded and fail to get notified when the value changes. This went unnoticed because it only applies to direct mode, the tests for which live in a separate repository. Fixes: QTBUG-102022 Pick-to: dev 6.3 6.2 Change-Id: I23d94ccbef5b00c4c6837c88970a4e40b05a912a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on '6.3.0' in qt/qtdeclarativev6.3.0-rc1Qt Submodule Update Bot2022-03-231-5/+5
| | | | | Change-Id: Ia663d8d5443f2b778f7036944239d8491402d450 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.0' in qt/qtdeclarativeQt Submodule Update Bot2022-03-231-5/+5
| | | | | Change-Id: I5a0deef3c17c80f2d7b0cb5b484722aa352dc058 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.0' in qt/qtdeclarativeQt Submodule Update Bot2022-03-211-5/+5
| | | | | Change-Id: I3b70c798016940ead41826c1c7401984d74b4ae5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix warning after QString::count deprecationVolker Hilsheimer2022-03-201-1/+1
| | | | | | | Change-Id: Id91980b01def84ff56212a267aca805ac7deb192 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 9a2bbcd21bc579951c8c9007914705ab1026aedc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSGOpenGLDistanceFieldGlyphCache: fix UB (ordering of pointers not from the ↵Marc Mutz2022-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | same array) The code performed out of bounds checks by adding the size of the buffer to a pointer and comparing the result to the the one-past-the-end pointer of the buffer. This is UB, for three reasons: - in one case, a qint64 is added to a pointer, silently truncating the result on 32bit platforms - if the buffer overflow is large, the pointer value may wrap around, yielding a result that is numerically less than the end pointer, but still out-of-bounds. - pointer order is only defined within a C array, plus one past the end. On failure, pointers outside that range are compared. Fix by comparing distance(it, end) with the required size for the chunk to be written instead. Change-Id: I356bb8c8a65a93b8b1c1eb7bac381dd64bea719e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 8d9bd6b381bfc759d575954801b683354ad6a790) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSGOpenGLDistanceFieldGlyphCache: fix multiplication result truncationMarc Mutz2022-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | The type of the expression int * int is int, so truncation has already happened when the result is assigned to a qint64. Fix by casting one of the multiplicants to qint64 before performing the multiplication. This multiplication cannot overflow, because int is 32-bit on all supported platforms. The addition of 'size' to the pointer will still truncate the result, on 32bit platforms, but that check is in itself UB. A follow-up commit will fix the check, and with it the last truncation to 32bit. Coverity-Id: 218769 Change-Id: I0d71950695b9743db8c96d825e68bb1e9c47de02 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit cacfc1dbb9719c0ef55cff69dad0921ce1405438) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Add qml app deployment auto testAlexandru Croitor2022-03-1911-0/+518
| | | | | | | | | | | | | | | | | | | | | | | Add a cmake test that builds two user qml modules and a qml app, installs the built binaries, in a shared Qt build deploys the runtime dependencies and then runs the app to confirm that it works. With a static Qt, the installation of the runtime dependencies is skipped, but the app should still run, because all the modules plugins and resources are statically linked in. The test is expected to pass only when targeting Windows and macOS (both when using shared and static Qt). For the static case to work, we explicitly need to add a qrc:/// qml import path, to ensure that user module qmldir files are found. Task-number: QTBUG-98545 Change-Id: Id2abbd669f22f30b4e639bba0b4e14b792e08714 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c5483d1e53f65c3d3f63a031301db700d5a75c8a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Build tests without warnings after qtbase changesVolker Hilsheimer2022-03-193-27/+27
| | | | | | | | | | | Replace deprecated QString::count with QString::size or QString::length, depending on context, and use qsizetype instead of int. Change-Id: Ie4c08abd2cf2ba771c23e8def72756170cc07af7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 6fca2c1a6d5ae24a5ae48844df7579acc2656628) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Styled text: Remove an unneeded QString allocation and copyMårten Nordheim2022-03-191-2/+2
| | | | | | | | | QColor can take QStringView, and QStringView has a toInt function Change-Id: I2388f7fd329e817e45210fadbd8a2a3ab559707a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2c959a83962ba373c469cab6e89f474a0b4a93e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* DebugTranslationService: Do not show a window in the testUlf Hermann2022-03-191-2/+0
| | | | | | | | | | | | | The test works fine with the window hidden. Trying to show it gives problems in the CI. We also want to avoid showing windows in non-GUI tests as far as possible. Fixes: QTBUG-101738 Change-Id: I206f74f940e6ba7ac6346c85459b896387ab85a5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 08d0fb39b9872650e1395d8d6c0289bc119027c8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* FileDialog: do not add default suffix when content scheme is usedIvan Solovev2022-03-182-2/+12
| | | | | | | | | | | | | | | | | | | | On Android when a file is selected using the default file manager, the selected file is reported using the url with "content" scheme. This url does not use file suffixes. Before this patch, if the FileDialog had a defaultSuffix specified, that suffix was added to the returned content url, and as a result the file could not be found. This problem exists FileDialog from both QtQuick.Dialogs and Qt.labs.platforms, so this patch implements the similar fix in both of them. Fixes: QTBUG-94391 Change-Id: Ic6ba95e301857d9b72ee6f5ddb819b9aae9e66e3 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d10d1f97d0aadb1f26e99db1ef2c1c3d53458a38) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSGMaterialShader: make header QT_TYPESAFE_FLAGS-cleanMarc Mutz2022-03-171-2/+2
| | | | | | | Change-Id: Ie70c1f244fc132fde272e7c5d4a5675c7b77ddc1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 066ed34d126b264cafd1ead2bb823d33ee72a520) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ToolTip: test that smaller attached tooltips don't shrink larger onesMitch Curtis2022-03-172-0/+48
| | | | | | | | | | | | | | | | | This ensures that any solution to QTBUG-83630 does not cause a regression. The test that this patch adds fails for the Imagine style ToolTip (which is tracked by QTBUG-101704), but that can be fixed separately, as there is value in ensuring that we don't regress again via the other passing tests. Task-number: QTBUG-83630 Task-number: QTBUG-94764 Task-number: QTBUG-101704 Change-Id: I3a827b56c0aac9d402a71dc5c4124356a270b4ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 0b9a53598b9485afc84cf67271370d77794d6b2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: show how to make ComboBox's popup modal/manage events outside itMitch Curtis2022-03-172-0/+50
| | | | | | | | Change-Id: Ib582dcf819cc674a769efcaa370ee621efcbb7aa Fixes: QTBUG-61971 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 73cecf7289a8b399febe1ddec1514d2d825b087c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix sub-menu shortcuts not being triggeredMitch Curtis2022-03-163-0/+167
| | | | | | | | | | | | | | | When QQuickShortcutContext::matcher is checking who should get a shortcut, it starts with the object that registered the shortcut and climbs up its parent hierarchy until it finds a window. Sub-menus, unlike top-level menus, will not have an associated window until their parent menu is opened. So, check if the popup is a sub-menu so that actions within it can grab shortcuts. Change-Id: I07172b1038af1e9fffd9983f7bf0a155b11bb1c3 Fixes: QTBUG-101034 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 51ad5091929c7f2c4bab94fab9fa1c20996a6efa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Remove INSTALL_SOURCE_QMLTYPES warning, take 2Kai Köhne2022-03-161-4/+0
| | | | | | | | | | Amends e1affd04e4672116f04ef3269af21bc3aa27c7b0 Pick-to: 6.2 Task-number: QTBUG-99761 Change-Id: Id06dddddedbff4264430eb7fa6235c55174df389 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Clarify that a dynamic plugin is not resolvedAlexandru Croitor2022-03-161-2/+3
| | | | | | | | | | This make it clearer that if types are successfully found, it must mean that a static plugin or linked library must have been found. Change-Id: Ifaaa6fd4f385d7fc0e645b1da4a414a5cbbc7800 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 28708434b19c67557181eccc59ad154f4ac78cf3) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qqmlimport: Log when no qmldir file is foundAlexandru Croitor2022-03-162-2/+15
| | | | | | | | | | | | | | Also log when it is found, with the path where it is found. As a drive-by, add a 'version' label before printing the version of an imported library. In a static build where some libraries end up with a version set to 'invalid', it's clearer that the version is invalid, and not the library. Change-Id: I998776b13bfe98f1668790419f1102e081878c99 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 22b69dae253981b67124fc38adab666eb2d750be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Re-blacklist flaky tests on macOS CIMitch Curtis2022-03-162-0/+10
| | | | | | | | | | | | | | | | This is a partial revert of b0848d038b7bacfd656fbadc37993a81068132bb. The tests became flaky again in early February, 2022. Grafana shows no failures for 6.2, so this only appears to be an issue on dev and 6.3. Task-number: QTBUG-82015 Task-number: QTBUG-85624 Task-number: QTBUG-82404 Change-Id: Ie83f1c7e9660e26de4daf3418751faa0886d1651 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 8c658f618835217b3115c43080e22f28636f1c76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdeclarativeQt Submodule Update Bot2022-03-151-5/+5
| | | | | Change-Id: Iddb399d02b28435157007b0cbe4f2d9781f185fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: clarify CloseOnPress/Release* policy behaviorMitch Curtis2022-03-151-0/+5
| | | | | | | | | | Mention that they don't apply if another popup is clicked. Change-Id: Iaefe987f38897ec683af9f3fe1a21b5c75502fa5 Fixes: QTBUG-101573 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 90891916a44172b88024516646c4ce6533300126) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtQml: Restore immutability of QQmlPropertyCacheUlf Hermann2022-03-152-89/+86
| | | | | | | | | | | | | | | | | | | We need to make sure the operations on the metaobject pointer are atomic. Otherwise we can mess up the refcounting or create the shared metaobjects multiple times. We have an atomic refcounting mechanism, so let's use that. At the same time, realize that we don't have to double-indirect access to the static metaobjects because we don't have to refcount those. Therefore, replace the RefCountedMetaObject with a class that makes both the pointer operations and the refcounting atomic, and stores static metaobject pointers directly. Fixes: QTBUG-73271 Change-Id: Icd63413a3dbbb43ebb266ed6b4f9e6444ecbf908 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit fe37c2667efb189a0e43083f626da317cfd2fb60)
* Doc: Revise Qt QML module landing pageAndreas Eliasson2022-03-141-63/+60
| | | | | | | | Task-number: QTBUG-100369 Change-Id: I119a74c58fa1b6f310907d4275a08c9f8f3d0cf8 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 4015665bbd1e0f9d5af5dc6618275f1170b55bec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Remove MACOS_BUNDLE option from qml app deployment callAlexandru Croitor2022-03-141-1/+0
| | | | | | | | | | | | The MACOS_BUNDLE public option was removed from qtbase, but qml app deployment still used it, causing deployment to fail. Adapts to 0ada264dda533cd3be2699330a5c1e2dd27a0e6a in qtbase. Change-Id: I116518a8ce59511c8eb2755eb517576135bc3a25 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 243d77de1e7682bdd190530bdba75c03adb162f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQmlPropertyCache: Store checksums in type loaderUlf Hermann2022-03-149-21/+39
| | | | | | | | | | | | | | The type loader is specific to the engine. This way we can calculate/retrieve the checksum without modifying the property cache, which makes checksum() threadsafe. The checksums are only needed for loading and storing compilation units from/to disk. Therefore, there is no point in keeping them inside the property caches anyway. Task-number: QTBUG-73271 Change-Id: I7bea65e73769f76352bb5947d7229e256e7f2f25 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a2184b9ab7469bc5ca36478394243a04cda9006c) Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Doc: Fix ambiguous transition qml type linksAndreas Eliasson2022-03-142-11/+11
| | | | | | | | | | | | | Add the sqaure bracket argument to the link command to make sure the links go to the correct qml type page. Also, fix some line lengths in the c++ file to bypass the clang-format warning, which wouldn't allow me to commit. Task-number: QTBUG-101193 Change-Id: I45e22bdbec354de96b3598773b74d1754eda8a64 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 2af09901418d5639a2c105369559ab925cd7166b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdeclarativeQt Submodule Update Bot2022-03-141-5/+5
| | | | | Change-Id: Ia103ec98236f821158790106153bea690a639e14 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_qmltyperegistrar: Use qt_autogen_tools_initial_setupFabian Kosmale2022-03-131-0/+2
| | | | | | | | | | | Otherwise, it will break top-level builds, as moc might not have been build yet. Fixes: QTBUG-101617 Change-Id: Id938c2e96575b6f2ad65cd5d6f8fe2af1421b02a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7255b7db30098a6290a0c7af74e3ca0258900e4b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fusion MessageDialog: use 12 pixels for margins, rather than 20Oliver Eftevaag2022-03-121-18/+15
| | | | | | | | | | | | | | The other dialogs will ususally use a default 12 pixels if margins for the Fusion style. This patch aims to make the visuals more consistent with the other dialogs for the Fusion style. Task-number: QTBUG-100938 Change-Id: I29f0a8dc6c189f461324d953ddb526b1736110bb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c8e18a9e4d49d23f87fd1f2ab4531c3764ce8501) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ensure that image providers scale by defaultMitch Curtis2022-03-111-4/+2
| | | | | | | | | | This was broken in b6f085a275c76912862463657c2a91e35bd8936b. Change-Id: Ic2f9da5cf18098528de3165867f2befbaf0ed1c2 Fixes: QTBUG-100355 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 3c3acf73346bed194db9b76b99196ece5f03b1b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* fix doc for DragHandlerChunLin Wang2022-03-111-1/+1
| | | | | | | | | | fix doc for DragHandler::snapMode Fixes: QTBUG-101197 Change-Id: I08c8273066baead59d54c151d0f158ad73b22244 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit b92ab2b48e8a69baac0d236f09b56484d2ee7698) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add several autotest cases to Minimal set for STATIC buildTatiana Borisova2022-03-113-3/+17
| | | | | | | | | | | | | | - It is not possible to build all autotests for STATIC build, because CI doesn't have enough resources. But it is possible to build a few tests on CI for INTEGRITY testing. Task-number: QTBUG-99123 Change-Id: I698edb9cd0696dd55e1b82547cb57c34b993bb10 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 09cb6a4952d17925c8389216c16605eb68ab3418) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtdeclarativev6.3.0-beta3Qt Submodule Update Bot2022-03-111-5/+5
| | | | | Change-Id: I5f11c8120e9863dee7d8e07b14d98931600f79f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Suppress QLocale::nativeCountryName deprecationMårten Nordheim2022-03-101-1/+1
| | | | | | | Change-Id: Iba1799b94b63e4bf4d6aa8333fae867e4d08f429 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 473663128eaaf1c92ada255ac6ef1101c8bda790) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* masm: Repace bitwise | with || in bool expression in X86Assembler.hAndrei Golubev2022-03-091-1/+1
| | | | | | | | | | | | | | | | Produces a warning with clang 15 on Ubuntu: /home/ag/work/qt5/qtdeclarative/src/qml/../3rdparty/masm/assembler/X86Assembler.h:2368:23: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] emitRexIf(byteRegRequiresRex(reg)|byteRegRequiresRex(rm), reg, 0, rm); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Similar logic already uses || so this seems to be a typo. Change-Id: Ie539600e28748d902fbb443e47892a703003c7e6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit e86019ecbddd76d6551a18595ef9dcff8560f1d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make QML test files available to Creator's locatorMitch Curtis2022-03-097-0/+76
| | | | | | | Change-Id: I87acd2ff973b3acce6d575bf6b2e04b8e50f0597 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8751b64383ebf6da96a16a73cb6886067036442f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* masm: Fix whitespaces in x86Assembler.hAndrei Golubev2022-03-091-72/+72
| | | | | | | | Change-Id: I7a64585cc47c5dd3b1bb2139246bd98eea6335b9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit ada4580b69b22d21ac3c457af45ba87dc81a0aa1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: make validator documentation more discoverableMitch Curtis2022-03-092-1/+8
| | | | | | | | | | | Make it easier for users to discover the other types of validators by linking to various pages. Change-Id: Ifb15b9629ec81bdc7d3e4da4811f2b591a611d23 Fixes: QTBUG-101402 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 48b24f762f7f271d37ca0fb7f44efb6f6634d8ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QML: Unify treatment of invalid revisions on registrationUlf Hermann2022-03-093-10/+77
| | | | | | | | | | | | | Revisions before QML_ADDED_IN_VERSION and revisions after QML_REMOVED_IN_VERSION should both result in anonymous types. This way, you can then derive from the type in question and expose the derived type in a different set of versions. Change-Id: Ia59258047fc242c809c27525bb75fd2797fe5aab Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 464abaec05e0aa0ab699243412c50a5d5ac30742) Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Update dependencies on '6.3' in qt/qtdeclarativeQt Submodule Update Bot2022-03-081-5/+5
| | | | | Change-Id: Ifc37ab44175ca27d7ae7f17c0dceb3d1587257ea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 13:47:14 +0000