diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-15 16:27:16 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-16 14:14:09 +0000 |
| commit | 05fa4ac7dfa850c10f0ad37bfff4b649f93a5dde (patch) | |
| tree | 8764f5265a4b22dc52fcacc6e5a2870c2c5d6a26 /tools | |
| parent | 1de6fd49d16d34d54d2813c30d2fef831b8d5c63 (diff) | |
configure.exe: Fix detection of DirectWrite for MinGW.
Check on the correct library name.
Change-Id: I10980a8ba3e3e96d368319af0d86d6fb339c03ff
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3bf0546ac1..756703d1bd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2291,7 +2291,9 @@ bool Configure::checkAvailability(const QString &part) } else if (part == "WMF_BACKEND") { available = findFile("mfapi.h") && findFile("mf.lib"); } else if (part == "DIRECTWRITE") { - available = findFile("dwrite.h") && findFile("d2d1.h") && findFile("dwrite.lib"); + const char *dwriteLibrary = Environment::detectCompiler() != CC_MINGW + ? "dwrite.lib" : "libdwrite.a"; + available = findFile("dwrite.h") && findFile("d2d1.h") && findFile(QLatin1String(dwriteLibrary)); } else if (part == "DIRECT2D") { available = tryCompileProject("qpa/direct2d"); } else if (part == "ICONV") { |