diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-03-23 21:29:34 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 11:41:07 +0200 |
| commit | d8508b813950cad79600acb49ef5bef837f04934 (patch) | |
| tree | efc70cf8d9999e95ff1eccf18960b323c9102092 /configure | |
| parent | 9581e5895a89f9a4f28449ade4e2590e99903eeb (diff) | |
Reunite NAS support in configure with QSound
RIP
Change-Id: I7c47052ce4962f10dbcbbb8d48f05b3158d4a69a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -735,7 +735,6 @@ CFG_SSE4_1=auto CFG_SSE4_2=auto CFG_AVX=auto CFG_REDUCE_RELOCATIONS=auto -CFG_NAS=no CFG_ACCESSIBILITY=auto CFG_IWMMXT=no CFG_NEON=auto @@ -1598,13 +1597,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - nas-sound) - if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then - CFG_NAS="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; xcursor) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then CFG_XCURSOR="$VAL" @@ -5705,7 +5697,6 @@ fi [ "$CFG_GSTREAMER" = "yes" ] && QT_CONFIG="$QT_CONFIG gstreamer" [ "$CFG_DBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG dbus" [ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus dbus-linked" -[ "$CFG_NAS" = "system" ] && QT_CONFIG="$QT_CONFIG nas" [ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl" [ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked" [ "$CFG_MAC_HARFBUZZ" = "yes" ] && QT_CONFIG="$QT_CONFIG harfbuzz" @@ -6188,7 +6179,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME" [ "$CFG_GETIFADDRS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETIFADDRS" [ "$CFG_INOTIFY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY" -[ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" [ "$CFG_NIS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS" [ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL QT_NO_SSL" [ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL" |