aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktableview
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2018-08-17 14:52:48 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2018-08-21 19:55:01 +0000
commit7c06b3f9018249ca313b5dd2e6d34f3da9e8835c (patch)
tree5de9fb6a71d48884683cda1f18382dd217d55a69 /tests/auto/quick/qquicktableview
parentbb296168f426d7e646c0208427f25687f96e2693 (diff)
QQuickTableView: check if the providers are undefined, not null
Checking if QJSValue isNull() will just check if it contains the js value "null". But we want to check if the application has assigned anything at all to the providers. Any value other than a function will not be accepted (which we check for at the time we try to call them (from resolveColumnWidth() and resolveColumnHeight()). Change-Id: I24717b67e99dd1ad6684a83125d2a4c7826dd501 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick/qquicktableview')
-rw-r--r--tests/auto/quick/qquicktableview/data/alternatingrowheightcolumnwidth.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquicktableview/data/alternatingrowheightcolumnwidth.qml b/tests/auto/quick/qquicktableview/data/alternatingrowheightcolumnwidth.qml
index 4126dcf405..17a10453ea 100644
--- a/tests/auto/quick/qquicktableview/data/alternatingrowheightcolumnwidth.qml
+++ b/tests/auto/quick/qquicktableview/data/alternatingrowheightcolumnwidth.qml
@@ -63,8 +63,8 @@ Item {
id: tableViewDelegate
Rectangle {
objectName: "tableViewDelegate"
- implicitWidth: column % 2 ? 30 : 40
- implicitHeight: row % 2 ? 30 : 40
+ implicitWidth: column % 2 ? 40 : 30
+ implicitHeight: row % 2 ? 40 : 20
color: "lightgray"
border.width: 1
Text {