diff options
| author | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-05-03 12:30:49 +0200 |
|---|---|---|
| committer | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-05-05 09:14:48 +0000 |
| commit | 4d5fb551d6bcf32d74459ab378c231914c48ab10 (patch) | |
| tree | 6feeceaacad8bfea6e2c40e3a643941e665bfda6 /src/gui | |
| parent | 835c3e94f6089751421a19008d442faec9649ed8 (diff) | |
fix compilation with various -no-feature-* options
Change-Id: Ic1975db497613e3efe50be4246c167efe10d8e31
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qtexthtmlparser.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index f5fc562e13..fb12b681a4 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_PDF + // This map is used for symbol fonts to get the correct glyph names for the latin range static const unsigned short symbol_map[0x100] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -90,7 +92,7 @@ static const unsigned short symbol_map[0x100] = { // ---------------------------- PS/PDF helper methods ----------------------------------- -#ifndef QT_NO_PDF + QByteArray QFontSubset::glyphName(unsigned short unicode, bool symbol) { diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index c9a2a33e5a..5169c0325a 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1720,6 +1720,8 @@ QStringList QTextHtmlStyleSelector::nodeNames(NodePtr node) const #endif // QT_NO_CSSPARSER +#ifndef QT_NO_CSSPARSER + static inline int findAttribute(const QStringList &attributes, const QString &name) { int idx = -1; @@ -1729,8 +1731,6 @@ static inline int findAttribute(const QStringList &attributes, const QString &na return idx; } -#ifndef QT_NO_CSSPARSER - QString QTextHtmlStyleSelector::attribute(NodePtr node, const QString &name) const { const QStringList &attributes = parser->at(node.id).attributes; |