diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-29 14:37:35 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-29 17:32:05 +0100 |
| commit | b0b2b9c8f748a9e8d2e0c1ffbd6e09df5f385aeb (patch) | |
| tree | 365edb671a6005cb4153fa1765b6f414d75d2334 /config.tests | |
| parent | 7e05a400df49dd05c9f4d79ccdb24b3d78e4ca69 (diff) | |
Set the minimum required FreeType version to 2.1.10
...and get rid of workarounds for older versions,
which also makes the code more readable.
Change-Id: I087110c5f60cd664dad241776e1a0df901989c75
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/fontconfig/fontconfig.cpp | 2 | ||||
| -rw-r--r-- | config.tests/unix/freetype/freetype.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config.tests/unix/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp index 6d0eb71cbd..9348214899 100644 --- a/config.tests/unix/fontconfig/fontconfig.cpp +++ b/config.tests/unix/fontconfig/fontconfig.cpp @@ -39,7 +39,7 @@ # error "This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define" #endif -#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103) +#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110) # error "This version of freetype is too old." #endif diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp index dd337fd7e8..210bd67468 100644 --- a/config.tests/unix/freetype/freetype.cpp +++ b/config.tests/unix/freetype/freetype.cpp @@ -34,7 +34,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20103) +#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110) # error "This version of freetype is too old." #endif |