summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-12-09 11:59:06 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-19 06:10:27 +0100
commitd64f6a9061b1af00f252270064ca6ce3cee51f00 (patch)
tree88f3f3681d778dc9acb8ce1c61ba88d0c4c21a18 /qt.pro
parentd141befd6a39e4f31639342e45da157f9f7b7f78 (diff)
Added new gitmodule `qt3d'
To replace qtquick3d. This commit introduces qt3d, a follow-up commit will remove qtquick3d. Change-Id: I3d1b46e7e1e32960351f02ec22a6e555203f988a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro9
1 files changed, 8 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index 6124e52e..e61a5ea6 100644
--- a/qt.pro
+++ b/qt.pro
@@ -81,9 +81,15 @@ module_qtfeedback.subdir = $$IN_PWD/qtfeedback
module_qtfeedback.target = module-qtfeedback
module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative
+module_qt3d.subdir = $$IN_PWD/qt3d
+module_qt3d.target = module-qt3d
+module_qt3d.depends = module_qtbase module_qtdeclarative
+# not yet enabled by default (enable it when removing qtquick3d)
+module_qt3d.CONFIG = no_default_target no_default_install
+
module_qtquick3d.subdir = $$IN_PWD/qtquick3d
module_qtquick3d.target = module-qtquick3d
-module_qtquick3d.depends = module_qtbase module_qtdeclarative
+module_qtquick3d.depends = $${module_qt3d.depends}
module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
module_qtdocgallery.target = module-qtdocgallery
@@ -132,6 +138,7 @@ exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d
+exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity