diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-17 10:57:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-17 10:57:38 +0200 |
| commit | 7e609f6d109f8bebb7e2fe4bd8867c5a4f8ece3d (patch) | |
| tree | ecbd4f56e83a84233d42928e5554709ca8832ce1 /src/quick/items/qquickclipnode.cpp | |
| parent | 78f5b9e7f7295b9ba11da6908713fb938a1e0b90 (diff) | |
| parent | c0f3c8ae5cee3ecda1ac8829336aa95cbe4d330e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4ssa_p.h
src/qml/qml/qqmlobjectcreator.cpp
Change-Id: I8bb7fe773d657f908f20ee5e72c2b9bd643f6260
Diffstat (limited to 'src/quick/items/qquickclipnode.cpp')
| -rw-r--r-- | src/quick/items/qquickclipnode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickclipnode.cpp b/src/quick/items/qquickclipnode.cpp index 7c7fee4a42..747e844172 100644 --- a/src/quick/items/qquickclipnode.cpp +++ b/src/quick/items/qquickclipnode.cpp @@ -93,7 +93,7 @@ void QQuickDefaultClipNode::updateGeometry() int segments = qMin(30, qCeil(radius)); // Number of segments per corner. - g->allocate((segments + 1) * 2); + g->allocate((segments + 1) * 4); QVector2D *vertices = (QVector2D *)g->vertexData(); |