diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-29 10:02:17 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-15 20:11:03 +0000 |
| commit | dd22889ed63599d44baa3bcb0fff6f75f328ff50 (patch) | |
| tree | cadf48b87611e203f3b4bf85f40078f6f0e5ed15 /tools | |
| parent | a4a83f52f9ee862d703c21dcd9915ebfd7c72ac5 (diff) | |
Change the way we handle features that have sub-features
Make sure we always set the base feature as a flag in qtconfig, and
set the sub-feature in addition if it's being used.
Change-Id: Icfeb0ec1ac9e1a615b5b22eb5fcce47e0e7fc153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f5f4296000..63d7f79d38 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2632,22 +2632,20 @@ void Configure::generateOutputVars() qtConfig += "system-png"; // Double conversion ----------------------------------------------- - if (dictionary[ "DOUBLECONVERSION" ] == "qt") + if (dictionary[ "DOUBLECONVERSION" ] != "no") qtConfig += "doubleconversion"; - else if (dictionary[ "DOUBLECONVERSION" ] == "system") + if (dictionary[ "DOUBLECONVERSION" ] == "system") qtConfig += "system-doubleconversion"; - else if (dictionary[ "DOUBLECONVERSION" ] == "no") - qtConfig += "no-doubleconversion"; // Text rendering -------------------------------------------------- - if (dictionary[ "FREETYPE" ] == "yes") + if (dictionary[ "FREETYPE" ] != "no") qtConfig += "freetype"; - else if (dictionary[ "FREETYPE" ] == "system") + if (dictionary[ "FREETYPE" ] == "system") qtConfig += "system-freetype"; - if (dictionary[ "HARFBUZZ" ] == "qt") + if (dictionary[ "HARFBUZZ" ] != "no") qtConfig += "harfbuzz"; - else if (dictionary[ "HARFBUZZ" ] == "system") + if (dictionary[ "HARFBUZZ" ] == "system") qtConfig += "system-harfbuzz"; // Styles ------------------------------------------------------- @@ -2787,9 +2785,9 @@ void Configure::generateOutputVars() if (dictionary["QT_CUPS"] == "yes") qtConfig += "cups"; - if (dictionary["QT_ICONV"] == "yes") + if (dictionary["QT_ICONV"] != "no") qtConfig += "iconv"; - else if (dictionary["QT_ICONV"] == "sun") + if (dictionary["QT_ICONV"] == "sun") qtConfig += "sun-libiconv"; else if (dictionary["QT_ICONV"] == "gnu") qtConfig += "gnu-libiconv"; |