diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-11-03 18:43:30 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-06 12:05:50 +0100 |
| commit | 0b1e8399df0045fe900d5558afc8590114d4b922 (patch) | |
| tree | 7376fc4ce608266439bc57a91439386d9db5b902 /vcl/inc/CommonSalLayout.hxx | |
| parent | e8526657a20b6c9c25cf885a7f6caa6bb38e3f7c (diff) | |
QT5 fix build issues & cleanups
1. Linking problem on Windows due to Windows macros via
<vcl/sysdata.hxx> 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
Diffstat (limited to 'vcl/inc/CommonSalLayout.hxx')
| -rw-r--r-- | vcl/inc/CommonSalLayout.hxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index a44fee5cfe10..a8808bac8414 100644 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -45,13 +45,6 @@ class Qt5Font; class VCL_DLLPUBLIC CommonSalLayout : public GenericSalLayout { -#if ENABLE_QT5 - friend hb_blob_t* getFontTable(hb_face_t*, hb_tag_t, void*); - explicit CommonSalLayout(const FontSelectPattern &rFSP, - FreetypeFont *pFreetypeFont, - Qt5Font *pFont, bool bUseQt5); -#endif - hb_font_t* mpHbFont; const FontSelectPattern& mrFontSelData; css::uno::Reference<css::i18n::XBreakIterator> mxBreak; @@ -84,19 +77,23 @@ class VCL_DLLPUBLIC CommonSalLayout : public GenericSalLayout public: #if defined(_WIN32) explicit CommonSalLayout(HDC, WinFontInstance&, const WinFontFace&); - const FontSelectPattern& getFontSelData() const { return mrFontSelData; }; + const FontSelectPattern& getFontSelData() const { return mrFontSelData; } HFONT getHFONT() const { return mhFont; } WinFontInstance& getWinFontInstance() const { return mrWinFontInstance; } bool hasHScale() const; #elif defined(MACOSX) || defined(IOS) explicit CommonSalLayout(const CoreTextStyle&); - const CoreTextStyle& getFontData() const { return mrCoreTextStyle; }; + const CoreTextStyle& getFontData() const { return mrCoreTextStyle; } #else explicit CommonSalLayout(FreetypeFont&); - const FreetypeFont* getFreetypeFont() const { return mpFreetypeFont; }; + const FreetypeFont* getFreetypeFont() const { return mpFreetypeFont; } #if ENABLE_QT5 + explicit CommonSalLayout(const FontSelectPattern &rFSP, + FreetypeFont *pFreetypeFont, + Qt5Font *pFont, bool bUseQt5); explicit CommonSalLayout(Qt5Font&); - const Qt5Font* getQt5Font() const { return mpQFont; }; + const Qt5Font* getQt5Font() const { return mpQFont; } + bool useQt5() const { return mbUseQt5; } #endif #endif |