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

Don't set config-[minimal|small|...] in qconfig.pri anymore

Browse Source 
These values are artifacts from the past and not used anymore
since Qt 3 times.

Change-Id: Ide2a7b3bd000ec0bc280a5467549c1a974c019e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-03-30 12:19:47 +02:00
parent 53412df398
commit 24ac2f35c1
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -3041,18 +3041,9 @@ fi
# 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 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
case "$CFG_QCONFIG" in if [ "$CFG_QCONFIG" = full ]; then
minimal|small|medium|large|full) CFG_QCONFIG_PATH=
# these are a sequence of increasing functionality elif [ ! -f "$CFG_QCONFIG_PATH" ]; then
for c in minimal small medium large full; do
QT_CONFIG="$QT_CONFIG $c-config"
[ "$CFG_QCONFIG" = $c ] && break
done
[ "$CFG_QCONFIG" = full ] && CFG_QCONFIG_PATH=
;;
*)
# not known to be sufficient for anything
if [ ! -f "$CFG_QCONFIG_PATH" ]; then
CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"` CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"`
if [ ! -f "$CFG_QCONFIG_PATH" ]; then if [ ! -f "$CFG_QCONFIG_PATH" ]; then
echo >&2 "Error: configuration file not found:" echo >&2 "Error: configuration file not found:"
@ -3061,8 +3052,7 @@ minimal|small|medium|large|full)
echo >&2 " $CFG_QCONFIG_PATH" echo >&2 " $CFG_QCONFIG_PATH"
exit 1 exit 1
fi fi
fi fi
esac
if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then
echo echo