1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fontengine buildfix for xcb platform plugin.

Browse Source 
Change-Id: Ic909e1ac08163e62634643c68862e802a016b911
Reviewed-on: http://codereview.qt.nokia.com/442
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
Tapani Mikola 2011-06-10 09:25:54 +03:00 committed by Qt Continuous Integration System
parent afd5d43b0c
commit db37aa1004
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/qfontengine_ft.cpp
View File

@ -51,7 +51,6 @@
#include "qabstractfileengine.h" #include "qabstractfileengine.h"
#include "qthreadstorage.h" #include "qthreadstorage.h"
#include <qmath.h> #include <qmath.h>
#include <private/qharfbuzz_p.h>
#include "qfontengine_ft_p.h" #include "qfontengine_ft_p.h"
#include <ft2build.h> #include <ft2build.h>

6
src/gui/text/qfontengine_ft_p.h
View File

@ -70,11 +70,7 @@
#include <qmutex.h> #include <qmutex.h>
#if defined (QT_BUILD_GUI_LIB) #include "private/qharfbuzz_copy_p.h"
# include "private/qharfbuzz_p.h"
#else
# include "private/qharfbuzz_copy_p.h"
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

5
src/gui/text/qharfbuzz_copy_p.h
View File

@ -34,6 +34,9 @@
headers for font and text classes without having to pull in the full headers for font and text classes without having to pull in the full
harfbuzz library under QTDIR/src/3rdparty/harfbuzz/src harfbuzz library under QTDIR/src/3rdparty/harfbuzz/src
*/ */
#if defined(QT_BUILD_GUI_LIB) || defined(QT_COMPILES_IN_HARFBUZZ)
#include <private/qharfbuzz_p.h>
#else
extern "C" { extern "C" {
@ -98,4 +101,6 @@ typedef struct {
} }
#endif // ifdef QT_BUILD_GUI_LIB
#endif // QHARFBUZZ_COPY_P_H #endif // QHARFBUZZ_COPY_P_H

6
src/gui/text/qtextengine_p.h
View File

@ -71,11 +71,7 @@
#include "private/qtextdocument_p.h" #include "private/qtextdocument_p.h"
#endif #endif
#if defined (QT_BUILD_GUI_LIB) #include "private/qharfbuzz_copy_p.h"
# include "private/qharfbuzz_p.h"
#else
# include "private/qharfbuzz_copy_p.h"
#endif
#include "private/qfixed_p.h" #include "private/qfixed_p.h"

2
src/plugins/platforms/fontdatabases/basicunix/basicunix.pri
View File

@ -7,6 +7,8 @@ SOURCES += \
$$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp \ $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp \
$$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
DEFINES += QT_COMPILES_IN_HARFBUZZ
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
INCLUDEPATH += $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/basicunix INCLUDEPATH += $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/basicunix