Change-Id: I97095dbb3d56b1a89c8128bd9e83b44438afcd50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Change-Id: I5e5daa6d6ea0662628d100a8a1fdd954c59f56a4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
The properties are available in QWindow as well, and our property resolving doesn't consider properties in base classes when a revision excludes a property in a sublcass from being picked up. Currently, clients who import QtQuick 2.1, and hence bring in QQuickWindowQmlImpl instead of just QQuickWindow as the Window type, will get: "Window.y" is not available in QtQuick 2.1. The workaround is to either import QtQuick 2.0, or remove the version from the import. This is a partial revert of 0fdca3e40d9afed9bc745a902a7fce6329d0e2b4 Pick-to: 6.7 dev Change-Id: I34346627e5ae12a40ddd298eea9a9e1bbc89d815 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Fixes: QTBUG-123332 Change-Id: I013df5a7e1db6bb06cb0efa85c73844e97e1bde5 Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io> (cherry picked from commit 11843cc125f5505fbec28392884ebd87eb607bba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 139b13f15a987ee9947fe16ac76131f0f3d33119)
Change-Id: Ie6a34d9cf06d69d4d2ecd0fa674471ffc36b718c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
a27b75c89da31a9ed1cf6dc6f6d3f3514ad28f8e doesn't work in its entirety on 6.7 branch; but this patch applies the parts that are possible. These docs have been adapted from the version in 6217408799c43869b8a7c1fcbff882d42ae71171. We update the html and markdown example files. We also move ScrollBar to make explanation easier. Change-Id: If65de335f840382b5e236d8a04db382b0b7aee6a Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 6217408799c43869b8a7c1fcbff882d42ae71171) (cherry picked from commit 3b44a457efcf42f4f6b3ce0d6ae41ef3821e4478) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Change-Id: If9dd60312aa2d4fbc9c6d398a832c55ab14301d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Since f3bcbfd6a50fb7e74f4ff6714d3b3066fa74e253, we use the underlying type of an enum when the binding is detected as a resolved enum and the property is of enum type. When using an enums underlying type, we can receive types that were formerly not possible, because we would normalize them to plain int. Fix this by teaching the object creator to handle assignments of signed and unsigned integer types. Fixes: QTBUG-123428 Change-Id: I3635b7de048e0c6ddf79381679aafee89a5b3def Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 186405955f1057111379369fc43951513c461aa9) Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Change-Id: Ib18693f3b88c43d6a0e685fdd47b323f5ef8488b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Add missing qqmlengine.h include in qandroidquickviewembedding.cpp as it may QQmlEngine may resolve to a forward declaration, resulting a compile-time incomplete type error. Fixes: QTBUG-123307 Change-Id: Ieb6e20f0a096450300cec267e6b1ab4671c037bc Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6667dd4b4066343084cc3d7d2ff80327c6c389f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 92aab1cd34d2b0a5c428d0007d8a99a73bbfb858)