Integrate Qt3D into Qt5 and fix some qdoc errors.

This doc change by 'integrating into Qt5' also made some changes to the
build system, so that now you need QT+=3d everywhere (instead of
QT+=qt3d as it was previously).

We have been asked to make this change, and it seems it is required for
this doc system to work, so lets get it done.

Note that the original change had a docsnippets target but that did not
work at all and will have be done in a later commit.

Change-Id: Icf4bc6b4be9494f1752e18ca1f5198c8fe8ecf53
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>

1 files changed, 40 insertions, 6 deletions

diff --git a/qt3d.pro b/qt3d.pro
index feea17aee..ba837474b 100644
--- a/qt3d.pro
+++ b/qt3d.pro
@@ -1,12 +1,46 @@
 TEMPLATE = subdirs
-SUBDIRS += src
-!gcov: SUBDIRS += util examples demos
 
-!package: SUBDIRS += tutorials
+module_qt3d_src.subdir = src
+module_qt3d_src.target = module-qt3d-src
 
-tests.CONFIG = no_default_install
-SUBDIRS += tests
-CONFIG += ordered
+module_qt3d_examples.subdir = examples
+module_qt3d_examples.target = module-qt3d-examples
+module_qt3d_examples.depends = module_qt3d_src
+!contains(QT_BUILD_PARTS,examples) {
+    module_qt3d_examples.CONFIG = no_default_target no_default_install
+}
+
+module_qt3d_demos.subdir = demos
+module_qt3d_demos.target = module-qt3d-demos
+module_qt3d_demos.depends = module_qt3d_src
+!contains(QT_BUILD_PARTS,examples) {
+    module_qt3d_demos.CONFIG = no_default_target no_default_install
+}
+
+module_qt3d_tutorials.subdir = tutorials
+module_qt3d_tutorials.target = module-qt3d-tutorials
+module_qt3d_tutorials.depends = module_qt3d_src
+module_qt3d_tutorials.CONFIG = no_default_target no_default_install
+
+module_qt3d_tests.subdir = tests
+module_qt3d_tests.target = module-qt3d-tests
+module_qt3d_tests.depends = module_qt3d_src
+module_qt3d_tests.CONFIG = no_default_install
+!contains(QT_BUILD_PARTS,tests):module_qt3d_tests.CONFIG += no_default_target
+
+module_qt3d_util.subdir = util
+module_qt3d_util.target = module-qt3d-util
+module_qt3d_util.depends = module_qt3d_src
+module_qt3d_util.CONFIG = no_default_target no_default_install
+
+SUBDIRS += module_qt3d_src \
+           module_qt3d_examples \
+           module_qt3d_demos \
+           module_qt3d_tests
+
+!package: SUBDIRS += module_qt3d_tutorials
+
+!gcov: SUBDIRS += module_qt3d_util
 
 include(doc/doc.pri)