1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

duplicate less work while handling -qconfig

Browse Source 
Change-Id: I8ba6b866f98c9fe7609af71c168023097e32828c
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2013-10-25 20:08:35 +02:00 committed by The Qt Project
parent fe41442575
commit 54c8c7a96a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -2389,6 +2389,7 @@ while [ "$#" -gt 0 ]; do
done done
# update QT_CONFIG to show our current predefined configuration # update QT_CONFIG to show our current predefined configuration
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
case "$CFG_QCONFIG" in case "$CFG_QCONFIG" in
minimal|small|medium|large|full) minimal|small|medium|large|full)
# these are a sequence of increasing functionality # these are a sequence of increasing functionality
@ -2396,15 +2397,19 @@ minimal|small|medium|large|full)
QT_CONFIG="$QT_CONFIG $c-config" QT_CONFIG="$QT_CONFIG $c-config"
[ "$CFG_QCONFIG" = $c ] && break [ "$CFG_QCONFIG" = $c ] && break
done done
[ "$CFG_QCONFIG" = full ] && CFG_QCONFIG_PATH=
;; ;;
*) *)
# not known to be sufficient for anything # not known to be sufficient for anything
if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ] && [ '!' -f `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` ]; then if [ ! -f "$CFG_QCONFIG_PATH" ]; then
echo >&2 "Error: configuration file not found:" CFG_QCONFIG_PATH=`"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"`
echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" if [ ! -f "$CFG_QCONFIG_PATH" ]; then
echo >&2 " or" echo >&2 "Error: configuration file not found:"
echo >&2 " `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"`" echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
OPT_HELP=yes echo >&2 " or"
echo >&2 " $CFG_QCONFIG_PATH"
OPT_HELP=yes
fi
fi fi
esac esac
@ -6319,11 +6324,7 @@ full)
*) *)
tmpconfig="$outpath/src/corelib/global/qconfig.h.new" tmpconfig="$outpath/src/corelib/global/qconfig.h.new"
echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig" echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig"
if [ -f "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" ]; then cat "$CFG_QCONFIG_PATH" >>"$tmpconfig"
cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig"
elif [ -f `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` ]; then
cat `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` >>"$tmpconfig"
fi
echo "#endif" >>"$tmpconfig" echo "#endif" >>"$tmpconfig"
;; ;;
esac esac