From e2a8ad145ec0b31ce78508774935f22026ceba63 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 6 Jan 2012 14:55:55 -0200 Subject: Fix the build of -qt-freetype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The symbol must be exported from QtGui for the plugins to be able to see it. Also, fix the build in namespaced case: cannot use extern in QtPlatformSupport because it's not compiled into the Qt namespace. Change-Id: I029533f3524e3cbf6c87aed79c1f2e7b55aebb9b Reviewed-by: Samuel Rødal --- src/gui/text/qfontengine_ft_p.h | 1 + src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 83b51685c0..2add894c19 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -364,6 +364,7 @@ inline QFontEngineFT::Glyph *QFontEngineFT::QGlyphSet::getGlyph(glyph_t index, Q return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition)); } +extern Q_GUI_EXPORT FT_Library qt_getFreetype(); QT_END_NAMESPACE diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 7650d770f3..279a1fbc22 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -670,7 +670,6 @@ static FcPattern *queryFont(const FcChar8 *file, const QByteArray &data, int id, if (data.isEmpty()) return FcFreeTypeQuery(file, id, blanks, count); - extern FT_Library qt_getFreetype(); FT_Library lib = qt_getFreetype(); FcPattern *pattern = 0; -- cgit v1.2.3