diff options
| -rw-r--r-- | configure.json | 7 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/configure.json b/configure.json index 6246485164..164571b297 100644 --- a/configure.json +++ b/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": { 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"; |