summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-04-20 13:11:00 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-04-27 11:08:19 +0000
commit34b3ea85829076b5d668c3940b1d1d7acc4b16d9 (patch)
treef866e6eda343d698de896a6adf4830d2d6df3df5
parentc5108cb5300a32ac3dd0c2c1e42dcf1d35c1ac2f (diff)
Fix build without quick module
Change-Id: I5a2a5ac0d498e8ab5568d57cd2c16e83d947fe47 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/src.pro160
1 files changed, 84 insertions, 76 deletions
diff --git a/src/src.pro b/src/src.pro
index 86a885e51..46c205849 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,63 +23,65 @@ src_extras.subdir = $$PWD/extras
src_extras.target = src_extras
src_extras.depends = src_render src_input src_logic
-# Quick3D libs
-src_quick3d_core.subdir = $$PWD/quick3d/quick3d
-src_quick3d_core.target = sub-quick3d-core
-src_quick3d_core.depends = src_core src_input
-
-src_quick3d_render.subdir = $$PWD/quick3d/quick3drender
-src_quick3d_render.target = sub-quick3d-render
-src_quick3d_render.depends = src_render src_quick3d_core
-
-src_quick3d_input.subdir = $$PWD/quick3d/quick3dinput
-src_quick3d_input.target = sub-quick3d-input
-src_quick3d_input.depends = src_input src_quick3d_core
-
-src_quick3d_animation.subdir = $$PWD/quick3d/quick3danimation
-src_quick3d_animation.target = sub-quick3d-animation
-src_quick3d_animation.depends = src_animation src_quick3d_core src_quick3d_render
-
-src_quick3d_extras.subdir = $$PWD/quick3d/quick3dextras
-src_quick3d_extras.target = sub-quick3d-extras
-src_quick3d_extras.depends = src_render src_logic src_input src_extras src_quick3d_core
-
-src_quick3d_scene2d.subdir = $$PWD/quick3d/quick3dscene2d
-src_quick3d_scene2d.target = sub-quick3d-scene2d
-src_quick3d_scene2d.depends = src_render src_logic src_input src_quick3d_core
-
-# Quick3D imports
-src_quick3d_core_imports.file = $$PWD/quick3d/imports/core/importscore.pro
-src_quick3d_core_imports.target = sub-quick3d-imports-core
-src_quick3d_core_imports.depends = src_quick3d_core
-
-src_quick3d_imports_render.file = $$PWD/quick3d/imports/render/importsrender.pro
-src_quick3d_imports_render.target = sub-quick3d-imports-render
-src_quick3d_imports_render.depends = src_quick3d_render
-
-src_quick3d_imports_scene3d.file = $$PWD/quick3d/imports/scene3d/importsscene3d.pro
-src_quick3d_imports_scene3d.target = sub-quick3d-imports-scene3d
-src_quick3d_imports_scene3d.depends = src_quick3d_render src_input
-
-src_quick3d_imports_input.file = $$PWD/quick3d/imports/input/importsinput.pro
-src_quick3d_imports_input.target = sub-quick3d-imports-input
-src_quick3d_imports_input.depends = src_input src_quick3d_input
-
-src_quick3d_imports_logic.file = $$PWD/quick3d/imports/logic/importslogic.pro
-src_quick3d_imports_logic.target = sub-quick3d-imports-logic
-src_quick3d_imports_logic.depends = src_logic
-
-src_quick3d_imports_animation.file = $$PWD/quick3d/imports/animation/importsanimation.pro
-src_quick3d_imports_animation.target = sub-quick3d-imports-animation
-src_quick3d_imports_animation.depends = src_animation src_quick3d_animation
-
-src_quick3d_imports_extras.file = $$PWD/quick3d/imports/extras/importsextras.pro
-src_quick3d_imports_extras.target = sub-quick3d-imports-extras
-src_quick3d_imports_extras.depends = src_extras src_quick3d_extras
-
-src_quick3d_imports_scene2d.file = $$PWD/quick3d/imports/scene2d/importsscene2d.pro
-src_quick3d_imports_scene2d.target = sub-quick3d-imports-scene2d
-src_quick3d_imports_scene2d.depends = src_quick3d_scene2d
+qtHaveModule(quick) {
+ # Quick3D libs
+ src_quick3d_core.subdir = $$PWD/quick3d/quick3d
+ src_quick3d_core.target = sub-quick3d-core
+ src_quick3d_core.depends = src_core src_input
+
+ src_quick3d_render.subdir = $$PWD/quick3d/quick3drender
+ src_quick3d_render.target = sub-quick3d-render
+ src_quick3d_render.depends = src_render src_quick3d_core
+
+ src_quick3d_input.subdir = $$PWD/quick3d/quick3dinput
+ src_quick3d_input.target = sub-quick3d-input
+ src_quick3d_input.depends = src_input src_quick3d_core
+
+ src_quick3d_animation.subdir = $$PWD/quick3d/quick3danimation
+ src_quick3d_animation.target = sub-quick3d-animation
+ src_quick3d_animation.depends = src_animation src_quick3d_core src_quick3d_render
+
+ src_quick3d_extras.subdir = $$PWD/quick3d/quick3dextras
+ src_quick3d_extras.target = sub-quick3d-extras
+ src_quick3d_extras.depends = src_render src_logic src_input src_extras src_quick3d_core
+
+ src_quick3d_scene2d.subdir = $$PWD/quick3d/quick3dscene2d
+ src_quick3d_scene2d.target = sub-quick3d-scene2d
+ src_quick3d_scene2d.depends = src_render src_logic src_input src_quick3d_core
+
+ # Quick3D imports
+ src_quick3d_core_imports.file = $$PWD/quick3d/imports/core/importscore.pro
+ src_quick3d_core_imports.target = sub-quick3d-imports-core
+ src_quick3d_core_imports.depends = src_quick3d_core
+
+ src_quick3d_imports_render.file = $$PWD/quick3d/imports/render/importsrender.pro
+ src_quick3d_imports_render.target = sub-quick3d-imports-render
+ src_quick3d_imports_render.depends = src_quick3d_render
+
+ src_quick3d_imports_scene3d.file = $$PWD/quick3d/imports/scene3d/importsscene3d.pro
+ src_quick3d_imports_scene3d.target = sub-quick3d-imports-scene3d
+ src_quick3d_imports_scene3d.depends = src_quick3d_render src_input
+
+ src_quick3d_imports_input.file = $$PWD/quick3d/imports/input/importsinput.pro
+ src_quick3d_imports_input.target = sub-quick3d-imports-input
+ src_quick3d_imports_input.depends = src_input src_quick3d_input
+
+ src_quick3d_imports_logic.file = $$PWD/quick3d/imports/logic/importslogic.pro
+ src_quick3d_imports_logic.target = sub-quick3d-imports-logic
+ src_quick3d_imports_logic.depends = src_logic
+
+ src_quick3d_imports_animation.file = $$PWD/quick3d/imports/animation/importsanimation.pro
+ src_quick3d_imports_animation.target = sub-quick3d-imports-animation
+ src_quick3d_imports_animation.depends = src_animation src_quick3d_animation
+
+ src_quick3d_imports_extras.file = $$PWD/quick3d/imports/extras/importsextras.pro
+ src_quick3d_imports_extras.target = sub-quick3d-imports-extras
+ src_quick3d_imports_extras.depends = src_extras src_quick3d_extras
+
+ src_quick3d_imports_scene2d.file = $$PWD/quick3d/imports/scene2d/importsscene2d.pro
+ src_quick3d_imports_scene2d.target = sub-quick3d-imports-scene2d
+ src_quick3d_imports_scene2d.depends = src_quick3d_scene2d
+}
# Qt3D Scene Parser plugins
src_plugins_sceneparsers.file = $$PWD/plugins/sceneparsers/sceneparsers.pro
@@ -91,10 +93,12 @@ src_plugins_geometryloaders.file = $$PWD/plugins/geometryloaders/geometryloaders
src_plugins_geometryloaders.target = sub-plugins-geometryloaders
src_plugins_geometryloaders.depends = src_render src_extras
-# Qt3D Render plugins
-src_plugins_render.file = $$PWD/plugins/renderplugins/renderplugins.pro
-src_plugins_render.target = sub-plugins-render
-src_plugins_render.depends = src_render src_extras src_quick3d_render src_quick3d_scene2d
+qtHaveModule(quick) {
+ # Qt3D Render plugins
+ src_plugins_render.file = $$PWD/plugins/renderplugins/renderplugins.pro
+ src_plugins_render.target = sub-plugins-render
+ src_plugins_render.depends = src_render src_extras src_quick3d_render src_quick3d_scene2d
+}
SUBDIRS += \
src_core \
@@ -103,21 +107,25 @@ SUBDIRS += \
src_input \
src_animation \
src_extras \
- src_quick3d_core \
- src_quick3d_core_imports \
- src_quick3d_render \
- src_quick3d_input \
- src_quick3d_animation \
- src_quick3d_extras \
- src_quick3d_imports_render \
- src_quick3d_imports_scene3d \
- src_quick3d_imports_input \
- src_quick3d_imports_logic \
- src_quick3d_imports_animation \
- src_quick3d_imports_extras \
src_plugins_sceneparsers \
src_plugins_geometryloaders \
- src_plugins_render \
- src_quick3d_scene2d \
- src_quick3d_imports_scene2d \
doc
+
+qtHaveModule(quick) {
+ SUBDIRS += \
+ src_quick3d_core \
+ src_quick3d_core_imports \
+ src_quick3d_render \
+ src_quick3d_input \
+ src_quick3d_animation \
+ src_quick3d_extras \
+ src_quick3d_imports_render \
+ src_quick3d_imports_scene3d \
+ src_quick3d_imports_input \
+ src_quick3d_imports_logic \
+ src_quick3d_imports_animation \
+ src_quick3d_imports_extras \
+ src_plugins_render \
+ src_quick3d_scene2d \
+ src_quick3d_imports_scene2d
+}