diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-08-05 15:24:16 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-08-05 15:50:42 +0300 |
| commit | 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 (patch) | |
| tree | 056b44cc9d8404ee38cd01af6865f109b30fd799 /src/gui | |
| parent | f3c816befee4d0cd522e503b4eb04e1b3a892a6d (diff) | |
Fix GCC 4.8 build
Change-Id: I4994146b359e8e37f6c0fa1b27f03fb9e800fdd5
Fixes: QTBUG-77218
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qtriangulator_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextlayout.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h index c9ae2571f4..0abf87308a 100644 --- a/src/gui/painting/qtriangulator_p.h +++ b/src/gui/painting/qtriangulator_p.h @@ -94,7 +94,7 @@ public: } QVertexIndexVector() = default; - QVertexIndexVector(const QVertexIndexVector &other) = default; + QVertexIndexVector(const QVertexIndexVector &) = default; inline QVertexIndexVector &operator = (const QVertexIndexVector &other) { if (t == UnsignedInt) diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index a29791534e..2fc0fcd55a 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -114,8 +114,8 @@ public: // not ambiguous. Implementation detail that should not be documented. template<char = 0> #endif - QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) - : QTextLayout(text, font, const_cast<QPaintDevice*>(paintdevice)) + QTextLayout(const QString &textData, const QFont &textFont, const QPaintDevice *paintdevice) + : QTextLayout(textData, textFont, const_cast<QPaintDevice*>(paintdevice)) {} #else QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice = nullptr); |