diff options
author | Alex <qt-info@nokia.com> | 2010-06-04 07:27:13 +1000 |
---|---|---|
committer | Alex <qt-info@nokia.com> | 2010-06-04 07:27:13 +1000 |
commit | 15f6a038861ccd8ed3ca433a1c72e98af06d8e85 (patch) | |
tree | f3a1dec5bf3ff42bd66f85899e406515f6fc9c75 /configure | |
parent | 71696bf082554083aa252d4d38aac4e4c1f7ee61 (diff) |
remove old and obsolete configure checks for QtMultimedia
both libraries (QtMultimedia and QtMultimediaKit) can live alongside
each other
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 27 |
1 files changed, 0 insertions, 27 deletions
@@ -468,33 +468,6 @@ else echo "sensord_enabled = no" >> "$CONFIG_IN" fi -# Now module selection -# using 'expr match ....' should help a bit -#if [ -n "$MOBILITY_MODULES_UNPARSED" ]; then - # In theory we should do some sanity checking here. -# MOBILITY_MODULES="$MOBILITY_MODULES_UNPARSED" -#fi - -# Test if able to build multimedia -for module in $MOBILITY_MODULES; do - case "$module" in - multimedia) - echo "contains(QT_CONFIG,multimedia):message(1)" > 1.pro - SOMETHING=`qmake 1.pro 2>&1` - if [ "$SOMETHING" = "Project MESSAGE: 1" ]; then - MOBILITY_MODULES="$(echo $MOBILITY_MODULES | sed 's:multimedia::g')" - echo "Only one multimedia module allowed, please rebuild Qt with -no-multimedia" - fi - rm 1.pro - ;; - esac -done - -if [ -z "$MOBILITY_MODULES" ]; then - echo "No module available to build." - exit 1 -fi - # It's a lot easier to make qmake do the dependency checking... echo "mobility_modules = $MOBILITY_MODULES" >> "$CONFIG_IN" echo "contains(mobility_modules,versit): mobility_modules *= contacts" >> "$CONFIG_IN" |