diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-01-17 14:01:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-18 06:21:44 +0100 |
| commit | a0ee6a1a878d36170908e291a3217b474fa6eb69 (patch) | |
| tree | c8ba2a02a4cc5657ddf7972b7f66063834460396 | |
| parent | eea22574a12ffaa7270b02a1b1aa4387b85a3d93 (diff) | |
Switch default builds from qtquick3d repo to qt3d repo
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>
| -rw-r--r-- | qt.pro | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |