diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-13 03:24:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-13 03:24:43 (GMT) |
| commit | ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe (patch) | |
| tree | b0865c2107f0794feda8bdfc96d2e6447d6b045e /src/s60installs/s60installs.pro | |
| parent | 6c19bdb8552f3cc6ced2a20868f1f1952f94a69c (diff) | |
| parent | 50711dd7aa22052eff58431d9f4e95e1a688047e (diff) | |
| download | Qt-ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe.zip Qt-ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe.tar.gz Qt-ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index dfd2694..97b2232 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -158,11 +158,12 @@ symbian: { 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 + contains(QT_CONFIG, audio-routing-available) { + 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)" |