From 58d509da551595d2a3e49de9f8b01b0206723d01 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Tue, 20 Apr 2010 10:22:09 +1000 Subject: Fixed Qt build with mediaservices disabled. Disabled decalarative multimedia module and the player demo if qt is build without mediaservices. Reviewed-by: Kurt Korbatits --- demos/multimedia/multimedia.pro | 3 +-- 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 -- cgit v0.12