aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7.2' in qt/qtdeclarativev6.7.26.7.2Qt Submodule Update Bot2024-06-071-5/+5
| | | | | Change-Id: I4561ca428f7204827c7a704275cac56a08f34a27 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.2' in qt/qtdeclarativeQt Submodule Update Bot2024-06-061-5/+5
| | | | | Change-Id: I153ee6983f78023984a01175b4bf9d49f462296d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-06-031-5/+5
| | | | | Change-Id: I32c52a84a17577ca949bbe6f66d7cce45a712f9d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-311-5/+5
| | | | | Change-Id: Iefd020971414bc6e970bdc911ebab53bfb52a838 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* DelegateModel: Fix crash when model changes during model resetDavid Redondo2024-05-301-3/+7
| | | | | | | | | | | | | | | | | | There are two issues here at play that interact to a crash. First is using sender() inside the slot of a single shot connection. This doesn't work reliably as inside doActivate the connection is removed before invoking the slot. However QObject::sender() will look through all connections to find one with the same sender as the currentSender otherwise it returns nullptr. Which means as long as there are other connections to the same object sender() would still work. This brings us to the second issue, if the model changes between modelAboutToBeReset and modelReset, down the line the signal from the old model would still be handled and since there were no other connections to the old model anymore crash. Change-Id: I71af46ec691e0c130cf367ac9fa04308c0826481 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 1c2ff06654bf33dffbceaadcf777134a9121d5e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't update transform if it hasn't changedEskil Abrahamsen Blomfeldt2024-05-303-1/+186
| | | | | | | | | | | | | | | | Updating the transform marks it as dirty and causes rebatching. Since we were doing this even when nothing had changed, we were essentially rebatching every time there was any update to the shape. We should leave it to the node to decide if it has been updated. This adds two tests that verify that rebatching still happens when changing the color/gradient of the shape. Change-Id: Iefb7a21a89ac2c31053e473cf689fa06e34a40d5 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit e3d0233bbe3e130c72e3957c45007097c019530d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtQml: Document and uphold precondition of metaTypeFromJS()Ulf Hermann2024-05-305-6/+92
| | | | | | | | | | | | | | | The value needs to be a default-constructed instance. Otherwise a number of branches in this method produce unwanted effects, such as appending to an already existing array rather than creating a new one. Amends commit 1b89c1edcae68351632c2755e5408410c2ff98e3. Pick-to: 6.5 Fixes: QTBUG-125429 Change-Id: If175a02b3a794573abc03df206fbddd41f2855b4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit c16a3e5adb59f6da5e39e51ca15a4d5324d68d1c) Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Doc: Capitalize Singleton in code snippetAndreas Eliasson2024-05-291-1/+1
| | | | | | | | | | Writing singleton with a small 's' leads to a compile error. Fixes: QTBUG-125127 Change-Id: I7edc4512aceea34bcf2a0884c6b6e48ab3069f19 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f4fc10172e78a66de15ed67fe65ac5e03c64950c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* quick_test_main_with_setup: only activate windows where supportedMitch Curtis2024-05-291-4/+8
| | | | | | | | | | | | | | | | | | Otherwise we get warnings before initTestCase, meaning not even failOnWarning can catch them: "qWaitForWindowActive was called on a platform that doesn't support window activation. This means there is an error in the test and it should either check for the WindowActivation platform capability before calling qWaitForWindowActivate, use qWaitForWindowExposed instead, or skip the test. Falling back to qWaitForWindowExposed." Task-number: QTBUG-124230 Pick-to: 6.5 Change-Id: I8111928917b94d51ac9b94f470f5837a98f44a71 Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 0a458847e9d8dffadfbb8de349e2d26e4ce34bdb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* graph example: Do not use GLSL functions as uniform namesLaszlo Agocs2024-05-294-3/+3
| | | | | | | | | | | | | | | | | | | Using textureSize in the uniform block leads to renaming it to _textureSize when transpiling to GLSL. This is not reflected in the reflection metadata for some reason. For OpenGL this matters because the QRhi backend won't be correctly able to set up the uniforms when the names do not match. To overcome this, use a name in the shader that does not conflict with a built-in GLSL function. Strictly speaking the name (textureSize) is somewhat incorrect anyway. Use texCoordScale to express its meaning better. Pick-to: 6.6 6.5 6.2 Change-Id: I863e98c6d56cc46fad895763b9b5106a40e2952c Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 3d8c86976844bc9507b0ff677188eee64e49b732) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_focus: skip all tests on platforms without window activationMitch Curtis2024-05-291-0/+7
| | | | | | | | | | | | | Also fail on warnings so that warnings like the ones printed by qWaitForWindowActive will be caught in the future. Fixes: QTBUG-124230 Pick-to: 6.5 Change-Id: Ieed327fab35707574afc4e2290958d86c3cddc63 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit b5d12da89de0191d9406bf0de575623a209361fc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move duplicate WindowActivation checks into a skip macroMitch Curtis2024-05-299-105/+44
| | | | | | | | | | Task-number: QTBUG-124230 Pick-to: 6.5 Change-Id: I617f851cd2b2b1a4f4c3dada2e4ebdf5c4be18fd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 8d454b26263e5333d8475bbab91d7b3d1d5e04d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-291-5/+5
| | | | | Change-Id: Ia4fe81b818147ff04a3cea62e8eebf7bd1418a1a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* V4: Store the sign bit of NaNs in QV4::StaticValueUlf Hermann2024-05-282-3/+2
| | | | | | | | | | | | | We have a bit for this, which is already used on UMinus. We should also use it when directly encoding a double. This makes some ECMAScript tests pass. Pick-to: 6.5 Change-Id: Ie90c7ae9ce57064d14db0ed719a08d5858b47cd4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d2e355d10179890e41df1fe50e3f2322ff08c038) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc&qmltypereference fix link to w3 css/svg colorsChristian Ehrlicher2024-05-271-1/+1
| | | | | | | | | | | | The link to the svg colors changed to https://www.w3.org/TR/css-color-3/#svg-color Pick-to: 6.5 Fixes: QTBUG-74331 Change-Id: I52985e322c4da43fc78d768ebb60a0b27d112abe Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 5deb57432fb139d3147c7932cecb715d239a4e08) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TypedArray: Preserve exact NaN bit pattern on fill()Ulf Hermann2024-05-252-3/+8
| | | | | | | | | | ... as required by ECMAScript. Pick-to: 6.5 Change-Id: I31bc7e6a87e404a8e6d314c99f163f82208e13a1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2818506ba357e7912af20b5a8d24607e38f2dfb4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix ShaderEffect warning in tst_combobox.qmlMitch Curtis2024-05-243-10/+20
| | | | | | | | | | | | | | | - Port the fragment shader to Qt 6 syntax. - Generate a .frag.qsb file with the qsb tool. It's easier to generate the .frag.qsb file once than modify every CMakeLists.txt to do it at build time. Fixes: QTBUG-125580 Pick-to: 6.5 Change-Id: I7457339be6a9ebaff0744f84d4478e4e6ac256ae Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 03c1374e955ed5c1c50c2a9b4d16c9c3d32e9bde) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve font documentationMitch Curtis2024-05-242-3/+29
| | | | | | | | | | | | | - Move snippets into a file so they are tested by tst_quick_examples. - Add snippet that shows how to construct a standalone font, which is useful for sharing fonts among Components, for example. Pick-to: 6.5 Change-Id: I87ef72c601060b6874d727aa4800f254c62f3eaf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f09c20ae911d093a7dfa049043ab51b63a787366) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Move add_subdirectory(impl) calls for styles to the frontAlexandru Croitor2024-05-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise in a static build on macOS we get the warnings below, which happen when a target references a dependency that has not been created yet. CMake Warning at qtbase/cmake/QtFindPackageHelpers.cmake:551 (message): Could not find target Qt6::QuickControls2MacOSStyleImpl to query its package name. Defaulting to package name Qt6QuickControls2MacOSStyleImpl. Consider re-arranging the project structure to ensure the target exists by this point. Call Stack (most recent call first): cmake/QtFindPackageHelpers.cmake:601 (qt_internal_get_package_name_of_target) cmake/QtTargetHelpers.cmake:240 (qt_register_target_dependencies) cmake/QtPluginHelpers.cmake:285 (qt_internal_extend_target) src/qml/Qt6QmlBuildInternals.cmake:216 (qt_internal_add_plugin) src/quickcontrols/macos/CMakeLists.txt:42 (qt_internal_add_qml_module) Change-Id: I8759f21ee463765486908e49e996004f3b3e618c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 8c8bd839b9a288b2cd7cc25d1158ae3e4cf1ff00) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-231-5/+5
| | | | | Change-Id: I432ba42348d2fc054e6960bec4d4f8a63ab56074 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qmlcompiler: Sanitize qmldir paths before using themUlf Hermann2024-05-236-8/+35
| | | | | | | | | | | | They may contain backslashes. Pick-to: 6.5 Fixes: QTBUG-125393 Change-Id: Ifd8c97c44b036ab64a221775a7fe6316445f6cf8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 9b784345795984878d2938d6903e7c87ae7f0778) Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Fix warnings in tst_combobox.qmlMitch Curtis2024-05-231-12/+17
| | | | | | | | | | | | | | Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 5f97be6f4a167c25b5801143523fe19a16e7fa16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Call polish after setting HAlign in Qml TextEditEd Cooke2024-05-223-26/+27
| | | | | | | | | | | | | | | | | | Qml TextEdit does not call polish() in the setter for horizontal alignment. The test that tests horizontal alignment for TextEdit is broken, creating a Text item instead of a TextEdit and therefore calling the wrong setter. This test also has a false positive as a result of an unnecessary subtraction. Fixes: QTBUG-56921 Pick-to: 6.5 6.2 5.15 Change-Id: I21df3c4f403980fb5512abfd5e7e32a064cd60d7 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit e7d0395b47a110a4f35518b18b479535a1cf9ed1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* dom: avoid asserts during dom constructionSami Shalayel2024-05-214-34/+59
| | | | | | | | | | Add missing safeguards to avoid crashing when constructing the Dom, also add some tests. Fixes: QTBUG-123871 Change-Id: Ie5da7c3b7bbf61d49d755ec6c338e2011532e89b (cherry picked from commit 4c4605be79e564921699a065df58333d3ee10d59) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-211-5/+5
| | | | | Change-Id: I21bf3f491815c10fa5f26b932ccf20ad0db47c64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: import Basic style in customization snippetsMitch Curtis2024-05-2041-45/+45
| | | | | | | | | | | | | | This ensures that the user won't inadvertently base the customizations on top of the native styles, but also saves adding the extra code that using QtQuick.Templates would require. The first sentence of the section already states that the Basic style is in use. Fixes: QTBUG-125228 Pick-to: 6.5 Change-Id: I191f1664ab0dcf190e4825b98e7ec12f00de307f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit e4577eb6bb9308d2b84bfe66216333b001ac670b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: explain that Window doesn't apply palette.window automaticallyMitch Curtis2024-05-202-3/+17
| | | | | | | | | Fixes: QTBUG-124357 Pick-to: 6.5 Change-Id: Id899833d750fab69c0ca7c2a7a01d9e1f109e0e5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit a673fa92fb0fb79b891f1f4e4e8abf114afe0417) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* quicktest: Workaround for spurious ambiguity issue on IntegrityFabian Kosmale2024-05-201-3/+3
| | | | | | | | | | | | Explicitly qualify the type with its namespace to remove potential sources for ambiguity. Fixes: QTBUG-124229 Pick-to: 6.5 Change-Id: I967be64e0ce46557478707e3bdf50faed9c2bd23 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 213770f72d5c94771d3cb9b892be5f902fc6876b) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qv4estable: fix -Wsign-compareMarc Mutz2024-05-191-3/+3
| | | | | | | | | | | | | | QV4::ESTable::{m_capacity,m_size} are uints, so compare against 8U, too. Amends d3e36454830012e4fd4c538ddeab7cddbfacdc24. Task-number: QTBUG-123999 Pick-to: 6.5 6.2 5.15 Change-Id: I1b2a4ca27d0d7a4637461178cc14aadf18399fb1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit f6c03e330ebbc039a1d243806331ba0e6eaee3a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QJSPrimitiveValue: fix -Wswitch-enumMarc Mutz2024-05-191-3/+17
| | | | | | | | | | | | -Wswitch-enum is a stricter version of -Wswitch, kicking in even in the presence of a default: case label. We intend to add -Wswitch-enum to headersclean, so fix the warnings here by listing all enumerators explicitly. Change-Id: Ib015b27dc9186f49a941528425eb14e8f5bec987 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 768a410e5c453c5a54ce4be590da056bc69d4d2a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add Qt Academy courses in the documentationJaishree Vyas2024-05-171-0/+7
| | | | | | | | | | Added qtquick course to the main page. Fixes: QTBUG-124785 Change-Id: I292999f95b7e854f533ac49d137a1087fcd454a4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 794f5ed9cc25eedd260ad2ffc760a773afb82551) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix documentation for _NOOP functionsKai Köhne2024-05-162-5/+5
| | | | | | | | | Fixes: QTBUG-124657 Pick-to: 6.5 6.2 5.15 Change-Id: I8a00249e5df0aee3087c7beb2e5e60492c4cc34e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 3f6036de68313e03adcde5fdb28bfb23063554eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Prevent wrong symlinks on deployment of QML pluginsJoerg Bornemann2024-05-161-0/+6
| | | | | | | | | | | | | | Using qt_generate_deploy_qml_app_script with MACOS_BUNDLE_POST_BUILD created invalid symlinks if the app used statically built QML modules. To prevent this, read the target type from .qt/QtDeployTargets.cmake and skip the symlink creation for static libraries. Fixes: QTBUG-124771 Change-Id: Ib7568a0316511d4a4b27926c8f14499c4a404fcc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit f9deb54b7d6ecef95c964cdf9d7f3f68f5ad784f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Layouts: MenuBarItems should have a Fixed size policyJan Arve Sæther2024-05-151-0/+1
| | | | | | | | | | | | | Without this, it caused the MenuBar in e.g. examples/quickcontrols/filesystemexplorer to stretch all its MenuBar items Task-number: QTBUG-117597 Change-Id: Icf7e0748fe4396ffffbd1cbff22f74fc1bc38a5b Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 4623fb92cad329ddbbec0f530f89ee5f9fe6a12f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix app QML post bundle deployment with the Xcode generatorAlexandru Croitor2024-05-152-1/+27
| | | | | | | | | | | | | | | | | Xcode is a multi-config generator to places the application binary dir into a config specific sub-directory like Debug. The qml post build symlinking code did not account for that. Make sure to pass the configuration subdirectory both in the overridden QT_DEPLOY_PREFIX and CMAKE_INSTALL_PREFIX (pointing to the config-specific app build dir). Fixes: QTBUG-125153 Change-Id: I75f0dcf0bee56fe2a3c64274fe4b96a784d2f834 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 757bfef221654d5aeee72086393bd67b2c8554e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Drop duplicate \instantiates commandPaul Wicking2024-05-151-1/+0
| | | | | | | | | | QDoc doesn't support multiple uses of instantiates. Fixes: QTBUG-125076 Change-Id: I583b9ef045796ff8d5f4ebb834bbbab5210d419f Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit abc4dc8dc28575ab6fd8f8293f59cf353b3ef57d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-141-5/+5
| | | | | Change-Id: I33040af65228b322d8fe79c60a25e1b54c2c3cfc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* SplitView: fix resized item jumping in size when an item is hiddenMitch Curtis2024-05-102-21/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic that handles the item to the left of the handle being resized incorrectly used a hidden handle as the leftEdge. This would cause the item to get more space than it should because it thought it had more space to consume. Before the fix, leftEdge is 10 and accumulated is 0, so: // 390 400 0 10 const qreal rightStop = size - accumulated - pressedHandleSize; // 110 10 110 qreal leftStop = qMax(leftEdge, pressedHandlePos); // 110 110 110 390 const qreal newHandlePos = qBound(leftStop, pressedHandlePos, rightStop); // 100 110 10 const qreal newItemSize = newHandlePos - leftEdge; After the fix, leftEdge is 60 and accumulated is 0, so: // 390 400 0 10 const qreal rightStop = size - accumulated - pressedHandleSize; // 110 60 110 qreal leftStop = qMax(leftEdge, pressedHandlePos); // 110 110 110 390 const qreal newHandlePos = qBound(leftStop, pressedHandlePos, rightStop); // 50 110 60 const qreal newItemSize = newHandlePos - leftEdge; Fixes: QTBUG-125049 Pick-to: 6.5 Change-Id: I3cdf57693c71c1f367780eda0ff6794fea02d546 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> (cherry picked from commit e11637d28f33d5e4c4d1d09fd23ef4364151d625) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: recommend ApplicationWindow instead of Window when using ControlsMitch Curtis2024-05-081-0/+4
| | | | | | | | | | Task-number: QTBUG-124474 Pick-to: 6.5 Change-Id: I895a321892017e3c9ad32f66ad86ae87ef93da3d Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 92f6d22db96a28e5dfc8a8a9e510ce8aada8c2f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ComboBox: fix popup palette inheritanceMitch Curtis2024-05-085-5/+133
| | | | | | | | | | | | | | | 54a2a35f17d5e5d1793af63b76993a583e10ab41 fixed the theme/accent/primary inheritance of the Material and Universal style's ComboBox popups. This patch makes an equivalent fix for styles that use palettes. Now the Basic and Fusion ComboBox popups will have the correct colors in both light and dark modes. Fixes: QTBUG-124474 Pick-to: 6.5 Change-Id: I3e3fcdc9d6fe75f195cc4f4707eac6d30413121f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 0ad15c4101889a22bf9ff761e7d20ec515f46514) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Baseline tests: turn cursor off for text input controlsVolker Hilsheimer2024-05-072-0/+8
| | | | | | | | | | Otherwise the blinking cursor might result in mismatches. Change-Id: I2cd2c8984689986fa196d22bf65cc727e8adcc7f Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 8d0b55e988a38d0f1125d677b356fefaf743d2a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickText: consider DPR when drawing scalable inline imagesVladimir Belyavsky2024-05-075-42/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Take into account the device pixel ratio when drawing scalable inline images (such as SVG, SVGZ, PDF) in QML Text. Thus we can improve the image rendering quality, especially for cases when the image size is set explicitly. Consider the following case: Text { text: '<img src="foo.svg" width="16" height="16"/>' } In case the device pixel ratio is e.g. 1.5, we loaded the SVG file into 16x16 QImage and after that we upscaled it as a raster to 24x24 with quality loss. Now we consider DPR when loading the image. Note: this change improves only rendering for scalable images and do not provide the support for "@2x" raster resources. But this can be done in future changes. Fixes: QTBUG-113040 Change-Id: I8baada728e9acec5528553d0616ac37994ab80b6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit f8f42c929735dfb5a8f3202d4a4f3bf3f3d31d9a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-071-5/+5
| | | | | Change-Id: Id1aa1bee372ed9c6bc48d8d0946760032895a09c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Skip tst_QQuickApplicationWindow::attachedProperties on EGLFSŁukasz Matysiak2024-05-071-0/+4
| | | | | | | | | | | | | | The tst_QQuickApplicationWindow::attachedProperties test uses multiple windows. When on EGLFS, creating multiple windows ends up in a QFATAL error message stating EGLFS: OpenGL windows cannot be mixed with others. Fix the problem by skipping the test when on EGLFS. Task-number: QTBUG-115777 Change-Id: I5cf189715af7e64a27980fab238a9dcee20700f1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 4545e5c9737920dfcc35b563fc11561e3bdc3880) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Improve QQuickWidget constructor documentationKai Köhne2024-05-062-11/+10
| | | | | | | Change-Id: I5fdf9918432c4861ca40158789e0b4e03674b240 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f85d3f950a046d768d7644931ed8167d614ad19c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickWidget: Set WA_AcceptTouchEvents in all constructorsKai Köhne2024-05-061-22/+21
| | | | | | | | | | | | | So far this was set only in two of the three constructors. But all of them call init(). Amends 2f1be4c51a1655697933468c10ba53316306d207. Task-number: QTBUG-113384 Change-Id: Ie15cad40164e6faea626c005fddbf54bedaf3ffe Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b85ec1cab47e8cdc5383fc0c681cee8a9f453366) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QML macros: suppress Wredundant-declsFabian Kosmale2024-05-061-0/+25
| | | | | | | | | | | | | | | | | | When using multiple QML type registration macros, one might end up with duplicated friend declarations. This is fine as far as C++ is concerned, but triggers gcc's redundant-decls warning. Given that we require the friend declaration, and would like to keep it in the macros that actually need them (instead of putting them into the macros which are used in all types exposed to QML), we opt for suppressing the warning. Pick-to: 6.5 Fixes: QTBUG-124934 Change-Id: I4f43afddfefb6e546ddddbdc01435222398a06be Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit df3c82f6af0bf7b857ba7a5110643eb7abe84182) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adds documentation for the qml_in_kotlin_based_android_projects exampleKonsta Alajärvi2024-05-065-26/+120
| | | | | | | | | | | | | | | Documented the qml_in_kotlin_based_android_projects example in the same .qdoc file as the qml_in_java_based_projects example. Added snippets tags to MainActivity.kt. Added support for code snippets from .kt files in qtquick.qdocconf. Fixes: QTBUG-123423 Change-Id: I5ac4d231bf77a23b4083ca26712949d66c2483c1 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 947986009dd13ff2992c1f91b369493037fb1463) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-061-5/+5
| | | | | Change-Id: I2b2c8d66045ccd1afde8564b8d4b09e914e46a61 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qtdeclarativeQt Submodule Update Bot2024-05-031-5/+5
| | | | | Change-Id: I5d4e699b2e425ef0289facb5a4c3681b5b17c901 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-08 06:17:19 +0000