aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/imports.pro5
-rw-r--r--src/quick/configure.json2
-rw-r--r--src/quickshapes/qquickshapegenericrenderer_p.h1
3 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 9973883024..e0f66838ec 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -20,8 +20,9 @@ qtHaveModule(quick) {
labsanimation \
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 f8277332dc..8d1ddaea7c 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -134,7 +134,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 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