summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-06-27 10:56:50 +0200
committerLars Knoll <lars.knoll@qt.io>2016-07-01 07:32:12 +0000
commitcb260c6c7f1ebd4b3fa5f86c3d98ec8ff0486095 (patch)
treeafad81bdf93353da6a1865a0ae69a2e960569752 /tools
parent9fb56cfaaefef0b4e05d4bab85540b62c276518a (diff)
Harmonize directwrite handling between the configures
There is a config test for DirectWrite we should run, so use that instead of autoDetect=false in the new system. Also, don't add the feature to the CONFIG variable in configure.exe, as it's not used that way anyway. Change-Id: I9266ccda8405adce765eac8f0435d723c6bc6f1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index fc2000519a..7b03055fff 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3289,12 +3289,6 @@ void Configure::generateQConfigPri()
if (dictionary[ "LGMON" ] == "yes")
configStream << " lgmon";
- if (dictionary["DIRECTWRITE"] == "yes")
- configStream << " directwrite";
-
- if (dictionary["DIRECTWRITE2"] == "yes")
- configStream << " directwrite2";
-
if (dictionary["ANDROID_STYLE_ASSETS"] == "yes")
configStream << " android-style-assets";