diff options
Diffstat (limited to 'src/3rdparty/harfbuzz')
-rw-r--r-- | src/3rdparty/harfbuzz/qt_attribution.json | 17 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-impl.h | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/qt_attribution.json b/src/3rdparty/harfbuzz/qt_attribution.json new file mode 100644 index 0000000000..2c2b31e4a9 --- /dev/null +++ b/src/3rdparty/harfbuzz/qt_attribution.json @@ -0,0 +1,17 @@ +{ + "Id": "harfbuzz", + "Name": "HarfBuzz", + "QDocModule": "qtgui", + "QtUsage": "Optionally used in Qt GUI. Configure with -system-harfbuzz or -qt-harfbuzz to avoid.", + + "License": "MIT License", + "LicenseId": "MIT", + "LicenseFile": "COPYING", + "Copyright": "Copyright (c) 1992, 1993 + The Regents of the University of California. All rights reserved. + +Copyright (c) 2011 The FreeBSD Foundation +All rights reserved. +Portions of this software were developed by David Chisnall +under sponsorship from the FreeBSD Foundation." +} diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-impl.h b/src/3rdparty/harfbuzz/src/harfbuzz-impl.h index 5f430498c4..f98594ac91 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-impl.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-impl.h @@ -59,7 +59,7 @@ HB_BEGIN_HEADER #endif #ifndef HB_UNUSED -# define HB_UNUSED(arg) ((arg) = (arg)) +# define HB_UNUSED(arg) ((void)(arg)) #endif #define HB_LIKELY(cond) (cond) |