From 091e61b3525c700ce4198086bbd0d95a59fcb31f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 5 Jul 2016 13:09:17 -0700 Subject: Fix namespaced build using harfbuzz-ng harfbuzz-ng doesn't link to Qt libraries, but uses the Qt headers for some types. With CONFIG -= qt, we don't get QT_NAMESPACE set, which leads to linker errors later. Instead of setting QT_NAMESPACE, ask qversiontagging.h not to tag the headers. Change-Id: Ie585843cfb684bc3b6e3fffd145e7e438ae7c6bd Reviewed-by: Oswald Buddenhagen --- src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/3rdparty/harfbuzz-ng') diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 163842e8fc..4325fd153b 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -23,7 +23,10 @@ win32: DEFINES += HB_NO_WIN1256 android: DEFINES += _POSIX_C_SOURCE=200112L INCLUDEPATH += $$PWD/include + +# Harfbuzz-NG inside Qt uses the Qt atomics (inline code only) INCLUDEPATH += $$QT.core.includes +DEFINES += QT_NO_VERSION_TAGGING SOURCES += \ $$PWD/src/hb-blob.cc \ -- cgit v1.2.3