diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-20 11:48:55 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-21 09:41:29 +0000 |
commit | f48ada60c3d6b56881b7355a305ec3e9c00884a5 (patch) | |
tree | 252b3fb83be25fa1d83ead72400d550c997f39fa /src/quick | |
parent | 8799d55d72e2d857f92b3b8cf1910d51b165b88f (diff) |
Remove revisioning of shadowed x/y properties in QQuickWindowQmlImpl
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
Change-Id: I34346627e5ae12a40ddd298eea9a9e1bbc89d815
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 96d942b6c6d44b614a3a7d9a59b9f3ba26734b2d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquickwindowmodule_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index 3424d9802f..281c67800e 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -42,8 +42,8 @@ class Q_QUICK_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public QQmlParse visibilityChanged) Q_PROPERTY(QObject *screen READ screen WRITE setScreen NOTIFY screenChanged REVISION(2, 3)) Q_PROPERTY(QObject *parent READ visualParent WRITE setVisualParent NOTIFY visualParentChanged DESIGNABLE false FINAL REVISION(6, 7)) - Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged REVISION(6, 7)) - Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged REVISION(6, 7)) + Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged) + Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged) Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY zChanged FINAL REVISION(6, 7)) QML_ATTACHED(QQuickWindowAttached) QML_NAMED_ELEMENT(Window) @@ -77,8 +77,8 @@ Q_SIGNALS: Q_REVISION(6, 7) void visualParentChanged(QObject *); Q_REVISION(2, 3) void screenChanged(); - Q_REVISION(6, 7) void xChanged(int arg); - Q_REVISION(6, 7) void yChanged(int arg); + void xChanged(int arg); + void yChanged(int arg); Q_REVISION(6, 7) void zChanged(); protected: |