diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-08-30 01:57:00 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-30 20:26:03 +0200 |
commit | 427037c75d7c915b9fc61cadd0a4fb5c20875547 (patch) | |
tree | 8b52dd7e946cb25f95326672a851a0c06f2cfd56 /src/3rdparty | |
parent | 029b68ce92b77a57d701f0af3bbadedffcf262cf (diff) |
[2/2] Update bundled HarfBuzz-NG sources up to 0.9.20
Change-Id: Ia8ef11fce9326ed708bf2972514b46b9d105ad9e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/config.h | 2 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz.pri | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/config.h b/src/3rdparty/harfbuzz-ng/src/config.h index 62e42e54e4..fe9a450533 100644 --- a/src/3rdparty/harfbuzz-ng/src/config.h +++ b/src/3rdparty/harfbuzz-ng/src/config.h @@ -6,6 +6,8 @@ #define HB_NO_MT #define HB_NO_UNICODE_FUNCS +#define HB_DISABLE_DEPRECATED + #include <QtCore/qglobal.h> #ifndef HB_INTERNAL diff --git a/src/3rdparty/harfbuzz.pri b/src/3rdparty/harfbuzz.pri index fd0750ae1a..bc8d49c625 100644 --- a/src/3rdparty/harfbuzz.pri +++ b/src/3rdparty/harfbuzz.pri @@ -8,6 +8,7 @@ contains(QT_CONFIG, harfbuzz) { $$QT_HARFBUZZ_DIR/src/hb-buffer.cc \ $$QT_HARFBUZZ_DIR/src/hb-buffer-serialize.cc \ $$QT_HARFBUZZ_DIR/src/hb-common.cc \ + $$QT_HARFBUZZ_DIR/src/hb-face.cc \ $$QT_HARFBUZZ_DIR/src/hb-fallback-shape.cc \ $$QT_HARFBUZZ_DIR/src/hb-font.cc \ $$QT_HARFBUZZ_DIR/src/hb-ot-tag.cc \ @@ -24,6 +25,7 @@ contains(QT_CONFIG, harfbuzz) { $$QT_HARFBUZZ_DIR/src/hb-buffer-deserialize-json.hh \ $$QT_HARFBUZZ_DIR/src/hb-buffer-deserialize-text.hh \ $$QT_HARFBUZZ_DIR/src/hb-cache-private.hh \ + $$QT_HARFBUZZ_DIR/src/hb-face-private.hh \ $$QT_HARFBUZZ_DIR/src/hb-font-private.hh \ $$QT_HARFBUZZ_DIR/src/hb-mutex-private.hh \ $$QT_HARFBUZZ_DIR/src/hb-object-private.hh \ @@ -48,6 +50,7 @@ contains(QT_CONFIG, harfbuzz) { $$QT_HARFBUZZ_DIR/src/hb-blob.h \ $$QT_HARFBUZZ_DIR/src/hb-buffer.h \ $$QT_HARFBUZZ_DIR/src/hb-common.h \ + $$QT_HARFBUZZ_DIR/src/hb-face.h \ $$QT_HARFBUZZ_DIR/src/hb-font.h \ $$QT_HARFBUZZ_DIR/src/hb-set.h \ $$QT_HARFBUZZ_DIR/src/hb-shape.h \ |