diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-05-31 11:47:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-05-31 11:45:19 +0000 |
| commit | f7e29f07ffead8bd1cb6ff81bb791de2fb11fa5e (patch) | |
| tree | 2608bacee58088a348ee14f10f4b6ada44eedb68 | |
| parent | fe085457237da351c5113a12177e38bdd2e1edc1 (diff) | |
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>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |