diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 09:54:23 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 09:55:09 +0100 |
| commit | 51ce5b482997f76b8890876b07337b29609728e5 (patch) | |
| tree | 54f408028c7831428fca2772c6a909f2febffb54 /src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | |
| parent | 51ba25e0fc89882e5021bed718de91d58f7f3907 (diff) | |
| parent | d6ce94ae6367337ade2c590f182b973e2bcfa98c (diff) | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I9d668a655b548feab43e9d4b03e2437bdff76437
Diffstat (limited to 'src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 6b51d9679a..a8885d71df 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -7,14 +7,14 @@ CONFIG += \ load(qt_helper_lib) -DEFINES += HAVE_OT HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED +DEFINES += HAVE_OT HAVE_QT5_ATOMICS HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED # platform/compiler specific definitions DEFINES += HAVE_ATEXIT -gcc: DEFINES += HAVE_INTEL_ATOMIC_PRIMITIVES unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD INCLUDEPATH += $$PWD/include +INCLUDEPATH += $$OUT_PWD/../../../include SOURCES += \ $$PWD/src/hb-blob.cc \ |