From 0b1e8399df0045fe900d5558afc8590114d4b922 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 3 Nov 2017 18:43:30 +0100 Subject: QT5 fix build issues & cleanups 1. Linking problem on Windows due to Windows macros via include 2. Drop the custom MOC target for the old KF5 plugin 3. Correctly handle QT5 build without using QFont 4. ImplJobSetup is in the VL library, not the gen plugin Change-Id: Iad97b1b9b57a8c356aaa88178aff03d0c14558c7 --- vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/unx/generic') diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 57393255bcee..5a55ee47bff3 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -973,7 +973,7 @@ bool FreetypeFont::GetGlyphOutline(const GlyphItem& rGlyph, return true; } -const unsigned char* FreetypeFont::GetTable(const char* pName, sal_uLong* pLength) +const unsigned char* FreetypeFont::GetTable(const char* pName, sal_uLong* pLength) const { return mpFontInfo->GetTable( pName, pLength ); } -- cgit