diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-08 14:27:19 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-08 14:27:19 +0000 |
| commit | 26ebdeff75d9f0f7b1ca2f82c35d7eaa013c0982 (patch) | |
| tree | 88626bb5c88436b0e206907f15224bb035481f6b /src/3rdparty/freetype/src/bdf/bdf.c | |
| parent | 30178a22ffde5d216a350910668df0d906aced3b (diff) | |
| parent | fbfacd33be482fa3cf0aa5cffaf7006d538a2f92 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/3rdparty/freetype/src/bdf/bdf.c')
| -rw-r--r-- | src/3rdparty/freetype/src/bdf/bdf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/src/bdf/bdf.c b/src/3rdparty/freetype/src/bdf/bdf.c index f95fb76225..e54df6649b 100644 --- a/src/3rdparty/freetype/src/bdf/bdf.c +++ b/src/3rdparty/freetype/src/bdf/bdf.c @@ -24,9 +24,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define FT_MAKE_OPTION_SINGLE_OBJECT +#define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> + #include "bdflib.c" #include "bdfdrivr.c" |