From 4dcf40b30894c0535f8a06235d01928cd434819d Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Sat, 22 Feb 2014 14:06:43 +0200
Subject: Make bundled HarfBuzz-NG not depend on Qt

Change-Id: Id2a0e4ae4cf2b4a6c95985b3b31c846aac92f992
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/3rdparty/harfbuzz-ng/src/config.h | 17 +----------------
 src/3rdparty/harfbuzz.pri             |  1 -
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/3rdparty/harfbuzz-ng/src/config.h b/src/3rdparty/harfbuzz-ng/src/config.h
index db706987fe..cb68ab0e5b 100644
--- a/src/3rdparty/harfbuzz-ng/src/config.h
+++ b/src/3rdparty/harfbuzz-ng/src/config.h
@@ -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 */
diff --git a/src/3rdparty/harfbuzz.pri b/src/3rdparty/harfbuzz.pri
index e61ee7eab6..1b7f7b95e1 100644
--- a/src/3rdparty/harfbuzz.pri
+++ b/src/3rdparty/harfbuzz.pri
@@ -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) {
-- 
cgit v1.2.3