diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 21:15:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 13:57:55 +0100 |
| commit | 5ea41a2efa67c2ca1fe13a00992a8b7cb29a00cf (patch) | |
| tree | 7aca331e256e67a80a238cab281734e2687573e0 /src/corelib | |
| parent | 24f623bedac2009d6dd9034282053b87c94b0e21 (diff) | |
properly syncqt-ize harfbuzz headers
we were already installing them into QtCore/private, so turn them into
proper private headers to start with. this cleans up our project files.
Change-Id: I0795f79e03b60b5854de9e4dc339e9b5a5e6fd87
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qharfbuzz_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qunicodetools.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h index 8330921323..24b2dedc5c 100644 --- a/src/corelib/tools/qharfbuzz_p.h +++ b/src/corelib/tools/qharfbuzz_p.h @@ -54,7 +54,7 @@ #define QHARFBUZZ_P_H #include <QtCore/qglobal.h> -#include <harfbuzz-shaper.h> +#include <private/harfbuzz-shaper.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/tools/qunicodetools.cpp index e86fef61e7..6da5b349f8 100644 --- a/src/corelib/tools/qunicodetools.cpp +++ b/src/corelib/tools/qunicodetools.cpp @@ -44,7 +44,7 @@ #include "qunicodetables_p.h" #include "qvarlengtharray.h" -#include <harfbuzz-shaper.h> +#include <private/harfbuzz-shaper.h> #define FLAG(x) (1 << (x)) diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 88a59f5f77..564aff9ab9 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -133,7 +133,6 @@ pcre { } DEFINES += HB_EXPORT=Q_CORE_EXPORT -INCLUDEPATH += ../3rdparty/harfbuzz/src HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \ ../3rdparty/harfbuzz/src/harfbuzz-gdef.c \ @@ -146,8 +145,6 @@ SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \ tools/qharfbuzz.cpp HEADERS += tools/qharfbuzz_p.h -private_headers.files += ../3rdparty/harfbuzz/src/*.h - INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/md4 |