diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-04-20 00:22:09 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-04-20 00:22:09 (GMT) |
| commit | 58d509da551595d2a3e49de9f8b01b0206723d01 (patch) | |
| tree | 2407b43f43dc7af90f8206eabac548e9062a1525 | |
| parent | 115ecbea664e9f3b213f0d9244ea023a1623d94e (diff) | |
| download | Qt-58d509da551595d2a3e49de9f8b01b0206723d01.zip Qt-58d509da551595d2a3e49de9f8b01b0206723d01.tar.gz Qt-58d509da551595d2a3e49de9f8b01b0206723d01.tar.bz2 | |
Fixed Qt build with mediaservices disabled.
Disabled decalarative multimedia module and the player demo
if qt is build without mediaservices.
Reviewed-by: Kurt Korbatits
| -rw-r--r-- | demos/multimedia/multimedia.pro | 3 | ||||
| -rw-r--r-- | src/imports/imports.pro | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/demos/multimedia/multimedia.pro b/demos/multimedia/multimedia.pro index 042650f..fa29a12 100644 --- a/demos/multimedia/multimedia.pro +++ b/demos/multimedia/multimedia.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = player - +contains(QT_CONFIG, mediaservices): SUBDIRS = player diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 3886f5c..ecde0cc 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -3,5 +3,5 @@ TEMPLATE = subdirs SUBDIRS += widgets particles contains(QT_CONFIG, webkit): SUBDIRS += webkit -contains(QT_CONFIG, multimedia): SUBDIRS += multimedia +contains(QT_CONFIG, mediaservices): SUBDIRS += multimedia |