diff options
Diffstat (limited to 'src')
-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 | ||||
-rw-r--r-- | src/gui/opengl/opengl.pri | 2 | ||||
-rw-r--r-- | src/gui/text/text.pri | 2 | ||||
-rw-r--r-- | src/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/fontdatabases.pri | 1 | ||||
-rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 | ||||
-rw-r--r-- | src/widgets/widgets.pro | 2 |
9 files changed, 2 insertions, 16 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 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index c241354e9c..2256f201d2 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -46,5 +46,3 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qtriangulator.cpp } - -#INCLUDEPATH += ../3rdparty/harfbuzz/src diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index face6f248f..436b7c7aec 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -85,5 +85,3 @@ SOURCES += \ HEADERS += \ text/qplatformfontdatabase.h - -INCLUDEPATH += ../3rdparty/harfbuzz/src diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 57892c7300..64b33b8c97 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -59,5 +59,3 @@ SOURCES += qglshaderprogram.cpp \ gl2paintengineex/qtextureglyphcache_gl.cpp SOURCES += qgl_qpa.cpp - -INCLUDEPATH += ../3rdparty/harfbuzz/src diff --git a/src/platformsupport/fontdatabases/fontdatabases.pri b/src/platformsupport/fontdatabases/fontdatabases.pri index 0fc4e71a3f..003017473b 100644 --- a/src/platformsupport/fontdatabases/fontdatabases.pri +++ b/src/platformsupport/fontdatabases/fontdatabases.pri @@ -1,5 +1,4 @@ DEFINES += QT_COMPILES_IN_HARFBUZZ -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src !win32|contains(QT_CONFIG, freetype):!mac { include($$PWD/basic/basic.pri) diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 794bd3aa35..248c0992bf 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -7,8 +7,6 @@ QT *= core-private QT *= gui-private QT *= platformsupport-private -INCLUDEPATH += ../../../3rdparty/harfbuzz/src - # Note: OpenGL32 must precede Gdi32 as it overwrites some functions. LIBS *= -lole32 !wince*:LIBS *= -lgdi32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index f8f00af69b..5f06d4a522 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -41,8 +41,6 @@ testcocoon { load(testcocoon) } -INCLUDEPATH += ../3rdparty/harfbuzz/src - win32:!contains(QT_CONFIG, directwrite) { DEFINES += QT_NO_DIRECTWRITE } |