AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly syncqt-ize harfbuzz headers

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-12-03 21:15:02 +01:00 committed by The Qt Project
parent 24f623beda
commit 5ea41a2efa
16 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qharfbuzz_p.h
View File

@ -54,7 +54,7 @@
#define QHARFBUZZ_P_H
#include <QtCore/qglobal.h>
#include <harfbuzz-shaper.h>
#include <private/harfbuzz-shaper.h>
QT_BEGIN_NAMESPACE

2
src/corelib/tools/qunicodetools.cpp
View File

@ -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))

3
src/corelib/tools/tools.pri
View File

@ -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

2
src/gui/opengl/opengl.pri
View File

@ -46,5 +46,3 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
opengl/qtriangulator.cpp
}
#INCLUDEPATH += ../3rdparty/harfbuzz/src

2
src/gui/text/text.pri
View File

@ -85,5 +85,3 @@ SOURCES += \
HEADERS += \
text/qplatformfontdatabase.h
INCLUDEPATH += ../3rdparty/harfbuzz/src

2
src/opengl/opengl.pro
View File

@ -59,5 +59,3 @@ SOURCES += qglshaderprogram.cpp \
gl2paintengineex/qtextureglyphcache_gl.cpp
SOURCES += qgl_qpa.cpp
INCLUDEPATH += ../3rdparty/harfbuzz/src

1
src/platformsupport/fontdatabases/fontdatabases.pri
View File

@ -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)

2
src/plugins/platforms/windows/windows.pro
View File

@ -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

2
src/widgets/widgets.pro
View File

@ -41,8 +41,6 @@ testcocoon {
load(testcocoon)
}
INCLUDEPATH += ../3rdparty/harfbuzz/src
win32:!contains(QT_CONFIG, directwrite) {
DEFINES += QT_NO_DIRECTWRITE
}

9
sync.profile
View File

@ -3,7 +3,7 @@
"QtWidgets" => "$basedir/src/widgets",
"QtPrintSupport" => "$basedir/src/printsupport",
"QtOpenGL" => "$basedir/src/opengl",
"QtCore" => "$basedir/src/corelib",
"QtCore" => "$basedir/src/corelib;^$basedir/src/3rdparty/harfbuzz/src",
"QtXml" => "$basedir/src/xml",
"QtSql" => "$basedir/src/sql",
"QtNetwork" => "$basedir/src/network",
@ -74,10 +74,11 @@
my @angle_headers = ('egl.h', 'eglext.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h');
my @internal_zlib_headers = ( "crc32.h", "deflate.h", "gzguts.h", "inffast.h", "inffixed.h", "inflate.h", "inftrees.h", "trees.h", "zutil.h" );
my @zlib_headers = ( "zconf.h", "zlib.h" );
my @harfbuzz_headers = ( "harfbuzz-buffer-private.h", "harfbuzz-buffer.h", "harfbuzz-dump.h", "harfbuzz-external.h", "harfbuzz-gdef-private.h", "harfbuzz-gdef.h", "harfbuzz-global.h", "harfbuzz-gpos-private.h", "harfbuzz-gpos.h", "harfbuzz-gsub-private.h", "harfbuzz-gsub.h", "harfbuzz-impl.h", "harfbuzz-open-private.h", "harfbuzz-open.h", "harfbuzz-shape.h", "harfbuzz-shaper-private.h", "harfbuzz-shaper.h", "harfbuzz-stream-private.h", "harfbuzz-stream.h", "harfbuzz.h" );
@ignore_headers = ( @internal_zlib_headers );
@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers);
@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h", @zlib_headers, @angle_headers);
@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", @zlib_headers, @angle_headers);
@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
%inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h" ] );
# Module dependencies.
# Every module that is required to build this module should have one entry.

2
tests/auto/gui/text/qrawfont/qrawfont.pro
View File

@ -7,7 +7,5 @@ QT = core core-private gui gui-private testlib
SOURCES += \
tst_qrawfont.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
TESTDATA += testfont_bold_italic.ttf testfont.ttf
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

1
tests/auto/gui/text/qtextlayout/qtextlayout.pro
View File

@ -4,5 +4,4 @@ QT += core-private gui-private testlib
HEADERS +=
SOURCES += tst_qtextlayout.cpp
DEFINES += QT_COMPILES_IN_HARFBUZZ
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/auto/gui/text/qtextscriptengine/generate/generate.pro
View File

@ -1,6 +1,6 @@
CONFIG -= moc
QT += core-private # for harfbuzz
INCLUDEPATH += . /usr/include/freetype2
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
SOURCES += main.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

1
tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro
View File

@ -6,5 +6,4 @@ QT += core-private gui-private testlib
HEADERS +=
SOURCES += tst_qtextscriptengine.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

1
tests/auto/other/qcomplextext/qcomplextext.pro
View File

@ -4,5 +4,4 @@ TARGET = tst_qcomplextext
QT += widgets widgets-private testlib
QT += core-private gui-private
SOURCES += tst_qcomplextext.cpp
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
View File

@ -4,8 +4,6 @@ QT += core-private gui-private widgets-private
TEMPLATE = app
TARGET = tst_qtracebench
INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
RESOURCES += qtracebench.qrc
SOURCES += tst_qtracebench.cpp