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/salgdi.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/salgdi.hxx')
| -rw-r--r-- | vcl/inc/salgdi.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index a368630ebd74..1a9157ca9747 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_INC_SALGDI_HXX #include <vcl/metric.hxx> -#include <vcl/sysdata.hxx> #include "impfontmetricdata.hxx" #include "salgdiimpl.hxx" @@ -46,6 +45,7 @@ class OpenGLContext; class OutputDevice; class FreetypeFont; class CommonSalLayout; +struct SystemGraphicsData; #if ENABLE_CAIRO_CANVAS struct SystemFontData; |