From 9a924c6921862c38e7ad65d52153049f512a530a Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Thu, 19 Jan 2012 17:50:02 +1000 Subject: 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 Reviewed-by: Rohan McGovern Reviewed-by: Danny Pope --- qt.pro | 7 ------- 1 file changed, 7 deletions(-) (limited to 'qt.pro') 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 -- cgit v1.2.3