diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /src/quickshapes | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'src/quickshapes')
| -rw-r--r-- | src/quickshapes/qquickshapegenericrenderer.cpp | 2 | ||||
| -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 |
8 files changed, 2 insertions, 1 deletions
diff --git a/src/quickshapes/qquickshapegenericrenderer.cpp b/src/quickshapes/qquickshapegenericrenderer.cpp index e0df739987..91716981d8 100644 --- a/src/quickshapes/qquickshapegenericrenderer.cpp +++ b/src/quickshapes/qquickshapegenericrenderer.cpp @@ -49,7 +49,7 @@ #if QT_CONFIG(opengl) #include <QOpenGLContext> #include <QOffscreenSurface> -#include <QtGui/private/qopenglextensions_p.h> +#include <private/qopenglextensions_p.h> #endif QT_BEGIN_NAMESPACE 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 |