diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 08:18:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-08-08 12:49:44 +0200 |
| commit | 2329a3145e59c16b5bbc37cedad7e67e16f14fb8 (patch) | |
| tree | 73900588daab4c2c91ef0ff6566818905375ca85 /src/imports/shapes/qquickshapenvprrenderer_p.h | |
| parent | d0eb6f9e07156880c6d9de4b98b2e4abfc4a0bfb (diff) | |
| parent | 432e27ae092397cb2154f48103e729852c38cf2d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9
Diffstat (limited to 'src/imports/shapes/qquickshapenvprrenderer_p.h')
| -rw-r--r-- | src/imports/shapes/qquickshapenvprrenderer_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/shapes/qquickshapenvprrenderer_p.h b/src/imports/shapes/qquickshapenvprrenderer_p.h index ec7ba498f9..7eb2924ab7 100644 --- a/src/imports/shapes/qquickshapenvprrenderer_p.h +++ b/src/imports/shapes/qquickshapenvprrenderer_p.h @@ -81,7 +81,6 @@ public: void beginSync(int totalCount) override; void setPath(int index, const QQuickPath *path) override; - void setJSPath(int index, const QQuickShapePathCommands &path) override; void setStrokeColor(int index, const QColor &color) override; void setStrokeWidth(int index, qreal w) override; void setFillColor(int index, const QColor &color) override; @@ -122,7 +121,6 @@ private: }; void convertPath(const QQuickPath *path, ShapePathGuiData *d); - void convertJSPath(const QQuickShapePathCommands &path, ShapePathGuiData *d); QQuickShapeNvprRenderNode *m_node = nullptr; int m_accDirty = 0; |