summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-05-18 00:11:45 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-05-18 00:11:45 (GMT)
commit5a4329b6844277e92286fc0ae6d4ec15dece2bf6 (patch)
tree995ed37b78e2b72cce660d8f02908f038c87cc46 /src/src.pro
parent6ff95852da22ba8843a2913c92aa37af36236ca0 (diff)
downloadQt-5a4329b6844277e92286fc0ae6d4ec15dece2bf6.zip
Qt-5a4329b6844277e92286fc0ae6d4ec15dece2bf6.tar.gz
Qt-5a4329b6844277e92286fc0ae6d4ec15dece2bf6.tar.bz2
Removed mediaservices.
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/src.pro b/src/src.pro
index 9c4831c..796f990 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -17,7 +17,6 @@ contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns
contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon
contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia
-contains(QT_CONFIG, mediaservices): SRC_SUBDIRS += src_mediaservices
contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
contains(QT_CONFIG, webkit) {
exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore
@@ -67,10 +66,8 @@ src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support
src_qt3support.target = sub-qt3support
src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon
src_phonon.target = sub-phonon
-src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia/multimedia
+src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia
src_multimedia.target = sub-multimedia
-src_mediaservices.subdir = $$QT_SOURCE_TREE/src/multimedia/mediaservices
-src_mediaservices.target = sub-mediaservices
src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt
src_activeqt.target = sub-activeqt
src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins
@@ -108,7 +105,6 @@ src_declarative.target = sub-declarative
src_phonon.depends = src_gui
src_multimedia.depends = src_gui
contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl
- src_mediaservices.depends = src_multimedia
src_tools_activeqt.depends = src_tools_idc src_gui
src_declarative.depends = src_xml src_gui src_script src_network src_svg
src_plugins.depends = src_gui src_sql src_svg src_multimedia
@@ -116,7 +112,6 @@ src_declarative.target = sub-declarative
src_imports.depends = src_gui src_declarative
contains(QT_CONFIG, webkit) {
src_webkit.depends = src_gui src_sql src_network src_xml
- contains(QT_CONFIG, mediaservices):src_webkit.depends += src_mediaservices
contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit
src_imports.depends += src_webkit