summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2012-01-19 17:50:02 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-25 02:57:49 +0100
commit9a924c6921862c38e7ad65d52153049f512a530a (patch)
tree750867596bea12f25b5e6fbad5ff1be31187f521 /qt.pro
parent823340af637a2302c17e64f54f4aa3f076b3d9f4 (diff)
Remove QtQuick3D repository references from Qt5.
Qt3D had temporarily resided in the Qt5 repository under qtquick3d. There is now a qt3d submodule which is compiling and testing correctly. Qt5 had previously removed support for building the qtquick3d submodule by default. This commit is the final step in cleaning up the previous version. Task-number: QTBUG-22098 Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro7
1 files changed, 0 insertions, 7 deletions
diff --git a/qt.pro b/qt.pro
index 9a76ecb8..86be51ad 100644
--- a/qt.pro
+++ b/qt.pro
@@ -89,12 +89,6 @@ module_qt3d.subdir = $$IN_PWD/qt3d
module_qt3d.target = module-qt3d
module_qt3d.depends = module_qtbase module_qtdeclarative
-module_qtquick3d.subdir = $$IN_PWD/qtquick3d
-module_qtquick3d.target = module-qtquick3d
-module_qtquick3d.depends = $${module_qt3d.depends}
-# disabled by default (to be removed in favor of qt3d)
-module_qtquick3d.CONFIG = no_default_target no_default_install
-
module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
module_qtdocgallery.target = module-qtdocgallery
module_qtdocgallery.depends = module_qtbase module_qtscript module_qtdeclarative
@@ -139,7 +133,6 @@ exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
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