From ddeffeed1d933b6513f18533a9186e9f472da117 Mon Sep 17 00:00:00 2001
From: Karim Pinter <karim.pinter@qt.io>
Date: Thu, 16 Jan 2020 15:16:07 +0200
Subject: Remove shadereffect dependency from shapes

Uses wavefrontmesh only if the shadereffect feature is there. Path
doesn't need to depend on shadereffect feature only on gui module. The
shape also missed a sgtexture header.

Fixes: QTBUG-81296
Change-Id: I78425ef8a09226b99e9b9f6010dda9dac9009fe5
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 39c614bed375d67f796d1519ebd2997060f81a0b)
---
 src/imports/imports.pro                        | 5 +++--
 src/quick/configure.json                       | 2 +-
 src/quickshapes/qquickshapegenericrenderer_p.h | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 24e93fec1c..930ea51f31 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -17,8 +17,9 @@ qtHaveModule(quick) {
     SUBDIRS += \
         layouts \
         qtquick2 \
-        window \
-        wavefrontmesh
+        window
+
+    qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh
 
     qtHaveModule(testlib): SUBDIRS += testlib
     qtConfig(systemsemaphore): SUBDIRS += sharedimage
diff --git a/src/quick/configure.json b/src/quick/configure.json
index 9ec3531ef4..2e9a7db22f 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -129,7 +129,7 @@
             "label": "Path support",
             "purpose": "Provides Path elements.",
             "section": "Qt Quick",
-            "condition": "features.quick-shadereffect",
+            "condition": "module.gui",
             "output": [
                 "privateFeature"
             ]
diff --git a/src/quickshapes/qquickshapegenericrenderer_p.h b/src/quickshapes/qquickshapegenericrenderer_p.h
index 9928d7ab72..9e29cdc9c0 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
-- 
cgit v1.2.3