From f394d5873d01c6382022c9477f7938818284edda Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 24 Mar 2020 14:54:58 +0000 Subject: Screen example: avoid shadowing final props with required context props Amends 90b4528b846542bfa6f0723487315140b9de17b4 to fix the error qrc:/window/AllScreens.qml:75 Cannot override FINAL property Fixes: QTBUG-85724 Change-Id: Ie6528f6c9ccc6648ec76b4d237973588450cc932 Reviewed-by: Ulf Hermann (cherry picked from commit 99215e04e32c2138282abde3f2dc329d2f073d53) Reviewed-by: Paul Wicking --- examples/quick/window/AllScreens.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/quick/window/AllScreens.qml b/examples/quick/window/AllScreens.qml index ac0e1cb821..0cec36c0ab 100644 --- a/examples/quick/window/AllScreens.qml +++ b/examples/quick/window/AllScreens.qml @@ -72,11 +72,10 @@ Column { required property string name required property int virtualX required property int virtualY - required property int width - required property int height + required property var modelData // avoid shadowing Label.width and height lineHeight: 1.5 - text: name + "\n" + virtualX + ", " + virtualY + " " + width + "x" + height + text: name + "\n" + virtualX + ", " + virtualY + " " + modelData.width + "x" + modelData.height } } } -- cgit v1.2.3