aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-03-24 14:54:58 +0000
committerShawn Rutledge <shawn.rutledge@qt.io>2020-09-08 11:19:08 +0000
commitf394d5873d01c6382022c9477f7938818284edda (patch)
tree511dcc8f39aff57a1407dc3acbf63003ba4422a1
parent7429f6f366172bf2e1e3c97cc3ebbc4be61b0cde (diff)
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 <ulf.hermann@qt.io> (cherry picked from commit 99215e04e32c2138282abde3f2dc329d2f073d53) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--examples/quick/window/AllScreens.qml5
1 files 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
}
}
}