summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerick Hawcroft <derick.hawcroft@nokia.com>2010-05-18 01:29:57 (GMT)
committerDerick Hawcroft <derick.hawcroft@nokia.com>2010-05-18 01:29:57 (GMT)
commitdec910df27f2b6cf64a430b771fcab603fd687d6 (patch)
treea729c3e84cf0eb011027a80b8ac4794344cc31fd
parent5a4329b6844277e92286fc0ae6d4ec15dece2bf6 (diff)
downloadQt-dec910df27f2b6cf64a430b771fcab603fd687d6.zip
Qt-dec910df27f2b6cf64a430b771fcab603fd687d6.tar.gz
Qt-dec910df27f2b6cf64a430b771fcab603fd687d6.tar.bz2
More mediaservices removal work.
-rw-r--r--src/s60installs/s60installs.pro12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index dfd2694..90c362b 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -151,20 +151,10 @@ symbian: {
graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qvggraphicssystem$${QT_LIBINFIX}.dll
}
- contains(QT_CONFIG, multimedia):contains(QT_CONFIG, mediaservices):contains(QT_CONFIG, media-backend) {
+ contains(QT_CONFIG, multimedia){
qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll
}
- contains(QT_CONFIG, media-backend) {
- qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMediaServices$${QT_LIBINFIX}.dll
-
- mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
- mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
-
- DEPLOYMENT += mediaservices_plugins
-
- }
-
BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
}