diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:11 +0100 |
| commit | 9893e71cea5de10193376c1733db627ef0783614 (patch) | |
| tree | 391fabceb9d4ff6ba5f3ff2c2ec42acb613eb4ef /src/quickshapes | |
| parent | 87e7203532d69e0aaa0898a972d1d90fa589d519 (diff) | |
| parent | e1b4b267aa8c4d9c53e5af4def54f5e9e14e0103 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icb61522fb41a35303bb3d201b344a0407f67f9a0
Diffstat (limited to 'src/quickshapes')
| -rw-r--r-- | src/quickshapes/qquickshapegenericrenderer_p.h | 1 | ||||
| -rw-r--r-- | src/quickshapes/shaders_ng/conicalgradient.frag.qsb | bin | 1889 -> 1843 bytes | |||
| -rw-r--r-- | src/quickshapes/shaders_ng/conicalgradient.vert.qsb | bin | 1684 -> 1662 bytes | |||
| -rw-r--r-- | src/quickshapes/shaders_ng/lineargradient.frag.qsb | bin | 1423 -> 1363 bytes | |||
| -rw-r--r-- | src/quickshapes/shaders_ng/lineargradient.vert.qsb | bin | 1895 -> 1869 bytes | |||
| -rw-r--r-- | src/quickshapes/shaders_ng/radialgradient.frag.qsb | bin | 2579 -> 2539 bytes | |||
| -rw-r--r-- | src/quickshapes/shaders_ng/radialgradient.vert.qsb | bin | 1774 -> 1779 bytes |
7 files changed, 1 insertions, 0 deletions
diff --git a/src/quickshapes/qquickshapegenericrenderer_p.h b/src/quickshapes/qquickshapegenericrenderer_p.h index 4590c662c1..75c4277383 100644 --- a/src/quickshapes/qquickshapegenericrenderer_p.h +++ b/src/quickshapes/qquickshapegenericrenderer_p.h @@ -57,6 +57,7 @@ #include <qsggeometry.h> #include <qsgmaterial.h> #include <qsgrendererinterface.h> +#include <qsgtexture.h> #include <QtCore/qrunnable.h> QT_BEGIN_NAMESPACE diff --git a/src/quickshapes/shaders_ng/conicalgradient.frag.qsb b/src/quickshapes/shaders_ng/conicalgradient.frag.qsb Binary files differindex cee844fab4..f82d798d87 100644 --- a/src/quickshapes/shaders_ng/conicalgradient.frag.qsb +++ b/src/quickshapes/shaders_ng/conicalgradient.frag.qsb diff --git a/src/quickshapes/shaders_ng/conicalgradient.vert.qsb b/src/quickshapes/shaders_ng/conicalgradient.vert.qsb Binary files differindex 50508e242a..7d306e973b 100644 --- a/src/quickshapes/shaders_ng/conicalgradient.vert.qsb +++ b/src/quickshapes/shaders_ng/conicalgradient.vert.qsb diff --git a/src/quickshapes/shaders_ng/lineargradient.frag.qsb b/src/quickshapes/shaders_ng/lineargradient.frag.qsb Binary files differindex d25d5e7a79..640c3c334f 100644 --- a/src/quickshapes/shaders_ng/lineargradient.frag.qsb +++ b/src/quickshapes/shaders_ng/lineargradient.frag.qsb diff --git a/src/quickshapes/shaders_ng/lineargradient.vert.qsb b/src/quickshapes/shaders_ng/lineargradient.vert.qsb Binary files differindex c48646b036..1b5b19ded8 100644 --- a/src/quickshapes/shaders_ng/lineargradient.vert.qsb +++ b/src/quickshapes/shaders_ng/lineargradient.vert.qsb diff --git a/src/quickshapes/shaders_ng/radialgradient.frag.qsb b/src/quickshapes/shaders_ng/radialgradient.frag.qsb Binary files differindex 207e4d3429..1bcb8d55ef 100644 --- a/src/quickshapes/shaders_ng/radialgradient.frag.qsb +++ b/src/quickshapes/shaders_ng/radialgradient.frag.qsb diff --git a/src/quickshapes/shaders_ng/radialgradient.vert.qsb b/src/quickshapes/shaders_ng/radialgradient.vert.qsb Binary files differindex dadbfd60d6..7a77792e08 100644 --- a/src/quickshapes/shaders_ng/radialgradient.vert.qsb +++ b/src/quickshapes/shaders_ng/radialgradient.vert.qsb |