From d64f6a9061b1af00f252270064ca6ce3cee51f00 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 9 Dec 2011 11:59:06 +1000 Subject: 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 Reviewed-by: Toby Tomkins --- qt.pro | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'qt.pro') 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 -- cgit v1.2.3