aboutsummaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-10-27 10:25:16 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-27 03:10:57 +0200
commit52ba0cb05495d7d7514791b6e9654869f8902ea1 (patch)
tree9feff60873163177d0789b9064da01bde5b9b2a4 /qt.pro
parentb86353b417e305b6acab4a670744c3309c948da4 (diff)
Remove QtMultimediaKit - all content has moved to QtMultimedia.
Change-Id: I54741996cb3dbfbb76dd0f864e4e72cd8b6bbd67 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro9
1 files changed, 1 insertions, 8 deletions
diff --git a/qt.pro b/qt.pro
index 1282c146..8d0550eb 100644
--- a/qt.pro
+++ b/qt.pro
@@ -76,16 +76,10 @@ module_qtsystems.depends = module_qtbase module_qtdeclarative
module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia
module_qtmultimedia.target = module-qtmultimedia
module_qtmultimedia.depends = module_qtbase module_qtdeclarative
-# Have this turned off to start with so qt5 integrates
-module_qtmultimedia.CONFIG = no_default_target no_default_install
-
-module_qtmultimediakit.subdir = $$IN_PWD/qtmultimediakit
-module_qtmultimediakit.target = module-qtmultimediakit
-module_qtmultimediakit.depends = module_qtbase module_qtdeclarative
module_qtfeedback.subdir = $$IN_PWD/qtfeedback
module_qtfeedback.target = module-qtfeedback
-module_qtfeedback.depends = module_qtbase module_qtmultimediakit module_qtdeclarative
+module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative
module_qtquick3d.subdir = $$IN_PWD/qtquick3d
module_qtquick3d.target = module-qtquick3d
@@ -130,7 +124,6 @@ exists(qtactiveqt/qtactiveqt.pro): SUBDIRS += module_qtactiveqt
exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
-exists(qtmultimediakit/qtmultimediakit.pro): SUBDIRS += module_qtmultimediakit
exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d
exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery