diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
| commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
| tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /src/quick/items/qquickrectangle_p_p.h | |
| parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
| parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'src/quick/items/qquickrectangle_p_p.h')
| -rw-r--r-- | src/quick/items/qquickrectangle_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h index 3c1aaf7661..c7c5293f9b 100644 --- a/src/quick/items/qquickrectangle_p_p.h +++ b/src/quick/items/qquickrectangle_p_p.h @@ -73,7 +73,7 @@ public: } QColor color; - QQuickGradient *gradient; + QJSValue gradient; QQuickPen *pen; qreal radius; static int doUpdateSlotIdx; |