From 1880e8432fc6250c538a926c5e12bbb48cf92798 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 25 Apr 2016 15:07:40 +0200 Subject: [PATCH] Disable Directwrite 2 when Directwrite is disabled While this wouldn't have any consequences in practice, it was perceived as confusing to users that Directwrite 2 was listed as enabled in the summary when Qt was configured with -no-directwrite. To give a better presentation of what will actually be compiled, we force disable Directwrite 2 when Directwrite is disabled. Task-number: QTBUG-52952 Change-Id: I779772ecc4d47b20854588cedde2b097ae22ded4 Reviewed-by: Friedemann Kleint --- tools/configure/configureapp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9757e857e5..805db76196 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2500,7 +2500,9 @@ void Configure::autoDetection() if (dictionary["DIRECTWRITE"] == "auto") dictionary["DIRECTWRITE"] = checkAvailability("DIRECTWRITE") ? "yes" : "no"; - if (dictionary["DIRECTWRITE2"] == "auto") + if (dictionary["DIRECTWRITE"] == "no") + dictionary["DIRECTWRITE2"] = "no"; + else if (dictionary["DIRECTWRITE2"] == "auto") dictionary["DIRECTWRITE2"] = checkAvailability("DIRECTWRITE2") ? "yes" : "no"; // Mark all unknown "auto" to the default value..