AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable Directwrite 2 when Directwrite is disabled

Browse Source 
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 <Friedemann.Kleint@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2016-04-25 15:07:40 +02:00 committed by Eskil Abrahamsen Blomfeldt
parent 8996776f1e
commit 1880e8432f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure/configureapp.cpp
View File

@ -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..