Generate correct output for doubleconversion support in qconfig.pri

Setting doubleconversion if Qt is configured with -no-doubleconversion
doesn't make sense. This also brings the output of configure and
configure.exe in line with each other.

Change-Id: I8424cc45b1b69fdb0d074e76868e83544cf5eb38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Lars Knoll 2016-05-31 11:47:43 +02:00
parent fe08545723
commit f7e29f07ff

2
configure vendored
View File

@ -5686,7 +5686,7 @@ if [ "$CFG_GIF" = "yes" ]; then
fi
if [ "$CFG_DOUBLECONVERSION" = "system" ]; then
QT_CONFIG="$QT_CONFIG doubleconversion system-doubleconversion"
else
elif [ "$CFG_DOUBLECONVERSION" = "qt" ]; then
QT_CONFIG="$QT_CONFIG doubleconversion"
fi
if [ "$CFG_FREETYPE" = "no" ]; then