diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:12 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:27 +0100 |
| commit | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (patch) | |
| tree | 0d813d9d72baeb1b5f7be048e775896c73f134f5 /src/gui/text/qfont.h | |
| parent | 67ea445f09db9feea4e863faa12c45fb007f53a4 (diff) | |
| parent | 4cbadf699838406d14366ce61deec03cf45113f7 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
Diffstat (limited to 'src/gui/text/qfont.h')
| -rw-r--r-- | src/gui/text/qfont.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 683aa3bf65..e5734679ed 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -80,8 +80,10 @@ public: PreferQuality = 0x0040, PreferAntialias = 0x0080, NoAntialias = 0x0100, - OpenGLCompatible = 0x0200, - ForceIntegerMetrics = 0x0400, +#if QT_DEPRECATED_SINCE(5, 15) + OpenGLCompatible Q_DECL_ENUMERATOR_DEPRECATED = 0x0200, + ForceIntegerMetrics Q_DECL_ENUMERATOR_DEPRECATED = 0x0400, +#endif NoSubpixelAntialias = 0x0800, PreferNoShaping = 0x1000, NoFontMerging = 0x8000 |