diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-23 01:00:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-23 01:00:44 +0100 |
commit | bbea1b8a3a7742e8abf3e3c1c4a08828ec0f663a (patch) | |
tree | 75cf85396de2ad99deeeb457202bf0fb0e14409b /src/quickshapes | |
parent | 1ee5fed75f07ac63fe6f0463fca72af672304ddb (diff) | |
parent | 6597d990147d21d55449302cb3201e4769e15a2a (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I88e94fe3398a59f10c5a8b142204db5f3ccb2657
Diffstat (limited to 'src/quickshapes')
-rw-r--r-- | src/quickshapes/qquickshapegenericrenderer_p.h | 1 |
1 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 |