Make bundled HarfBuzz-NG not depend on Qt
Change-Id: Id2a0e4ae4cf2b4a6c95985b3b31c846aac92f992 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
parent
ce5a877a8b
commit
4dcf40b308
17
src/3rdparty/harfbuzz-ng/src/config.h
vendored
17
src/3rdparty/harfbuzz-ng/src/config.h
vendored
@ -2,29 +2,14 @@
|
||||
#define HB_CONFIG_H
|
||||
|
||||
#define HAVE_OT
|
||||
#define HAVE_ATEXIT
|
||||
|
||||
#define HB_NO_MT
|
||||
#define HB_NO_UNICODE_FUNCS
|
||||
|
||||
#define HB_DISABLE_DEPRECATED
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifndef HB_INTERNAL
|
||||
# define HB_INTERNAL Q_DECL_HIDDEN
|
||||
#endif
|
||||
|
||||
#if !defined(QT_NO_DEBUG)
|
||||
# define NDEBUG
|
||||
#endif
|
||||
|
||||
// because strdup() is not part of strict Posix, declare it here
|
||||
extern "C" char *strdup(const char *src);
|
||||
|
||||
#ifndef HAVE_ATEXIT
|
||||
# define HAVE_ATEXIT 1
|
||||
# include <QtCore/qcoreapplication.h>
|
||||
# define atexit qAddPostRoutine
|
||||
#endif
|
||||
|
||||
#endif /* HB_CONFIG_H */
|
||||
|
1
src/3rdparty/harfbuzz.pri
vendored
1
src/3rdparty/harfbuzz.pri
vendored
@ -113,7 +113,6 @@ contains(QT_CONFIG, harfbuzz) {
|
||||
}
|
||||
|
||||
DEFINES += HAVE_CONFIG_H
|
||||
QT += core-private
|
||||
|
||||
TR_EXCLUDE += $$QT_HARFBUZZ_DIR/*
|
||||
} else:contains(QT_CONFIG, system-harfbuzz) {
|
||||
|
Loading…
Reference in New Issue
Block a user