lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch default builds from qtquick3d repo to qt3d repo

Browse Source 
Disable qtquick3d by default and enable qt3d by default.
Make qtlocation depend on qt3d instead of qtquick3d.

qtquick3d still exists for now, and can be explicitly compiled if
necessary.

Change-Id: If1013a9361b17421217beffd2dc1864c5e8502f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Laing <david.laing@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
This commit is contained in:
Rohan McGovern
2012-01-17 14:01:11 +10:00
committed by Qt by Nokia
parent eea22574a1
commit a0ee6a1a87
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qt.pro
View File

@@ -67,7 +67,7 @@ module_qtqa.depends = module_qtbase
module_qtlocation.subdir = $$IN_PWD/qtlocation
module_qtlocation.target = module-qtlocation
module_qtlocation.depends = module_qtbase module_qtdeclarative module_qtquick3d
module_qtlocation.depends = module_qtbase module_qtdeclarative module_qt3d
module_qtsensors.subdir = $$IN_PWD/qtsensors
module_qtsensors.target = module-qtsensors
@@ -88,12 +88,12 @@ module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarati
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_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