diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-04 12:15:24 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-04 12:15:24 (GMT) |
| commit | 33664eaa591b4325f83643d8c8a21476b1306c34 (patch) | |
| tree | 0289aa3d18fb203a51f7f1f80db2d5c649044e7d | |
| parent | 172897759333186169e23f82097773beabea567f (diff) | |
| download | Qt-33664eaa591b4325f83643d8c8a21476b1306c34.zip Qt-33664eaa591b4325f83643d8c8a21476b1306c34.tar.gz Qt-33664eaa591b4325f83643d8c8a21476b1306c34.tar.bz2 | |
Disable compiling of the plugin when extra package not found
The plugin will only compile when the symbian audiorouting API
is installed which is not there by default. So check for that.
The configure check should be added soon too.
| -rw-r--r-- | src/plugins/mediaservices/mediaservices.pro | 4 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro index 27f05bc..0f0b021 100644 --- a/src/plugins/mediaservices/mediaservices.pro +++ b/src/plugins/mediaservices/mediaservices.pro @@ -9,5 +9,7 @@ contains(QT_CONFIG, media-backend) { SUBDIRS += gstreamer } - symbian:SUBDIRS += symbian + symbian:contains(QT_CONFIG, audio-routing-available) { + SUBDIRS += symbian + } } 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)" |