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>

configure.json

@@ -910,6 +910,11 @@
             "type": "tdsCompile",
             "test": "unix/tds"
         },
+        "directwrite": {
+            "description": "DirectWrite",
+            "type": "compile",
+            "test": "win/directwrite"
+        },
         "directwrite2": {
             "description": "DirectWrite 2",
             "type": "compile",
@@ -2128,8 +2133,8 @@
         },
         "directwrite": {
             "description": "DirectWrite",
-            "autoDetect": false,
             "emitIf": "config.win32",
+            "condition": "tests.directwrite",
             "output": [ "publicQtConfig" ]
         },
         "directwrite2": {

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";