diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 20:18:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 20:18:14 +0100 |
| commit | 4159ee840549df11287294f0928e90f35f3e06ff (patch) | |
| tree | 4a3947e37d54bdb78b4042e9ced20dbf181b5a2c /src/3rdparty/freetype/src/type1/Jamfile | |
| parent | 59dbf1786f22ec4ac88d8f9d38cac5cfb82acaea (diff) | |
| parent | c8c39ecc37c156ac2677de09a26548dfc274b564 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
config.tests/unix/ptrsize.test
configure
src/corelib/global/qnamespace.h
src/network/socket/qabstractsocket.cpp
tests/auto/other/networkselftest/networkselftest.pro
Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672
Diffstat (limited to 'src/3rdparty/freetype/src/type1/Jamfile')
| -rw-r--r-- | src/3rdparty/freetype/src/type1/Jamfile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/src/type1/Jamfile b/src/3rdparty/freetype/src/type1/Jamfile index 8e366baae5..d1a3af57e9 100644 --- a/src/3rdparty/freetype/src/type1/Jamfile +++ b/src/3rdparty/freetype/src/type1/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/type1 Jamfile # -# Copyright 2001 by +# Copyright 2001-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -16,7 +16,13 @@ SubDir FT2_TOP $(FT2_SRC_DIR) type1 ; if $(FT2_MULTI) { - _sources = t1afm t1driver t1objs t1load t1gload t1parse ; + _sources = t1afm + t1driver + t1gload + t1load + t1objs + t1parse + ; } else { |