From f7e29f07ffead8bd1cb6ff81bb791de2fb11fa5e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Tue, 31 May 2016 11:47:43 +0200
Subject: [PATCH] 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>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index a624b66225b..1b46f82f6d2 100755
--- a/configure
+++ b/configure
@@ -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