diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-25 12:27:13 +0200 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-11-27 13:50:13 +0000 |
| commit | bfdcbe8bfb526688b0f40b5d8a51f2fd145b2ade (patch) | |
| tree | 5fbc5275d7c475d0a48c61e95ee2c384547e80f2 /src/gui/text/qrawfont.cpp | |
| parent | 69817f6ad13e94ed51b15488b18bafe9b7f44c26 (diff) | |
QFont*: fix some const-incorrectnesses involving QFontPrivate
Detected with a modified (deep const propagating) shared data pointer.
Most are fixed by using copy constructor and assignment operator
of the shared pointer instead of feeding it .data(). The rest
required adding const locally.
Change-Id: I51e36b9e7040dc2211ef4c5dadfbda73ad22c414
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/text/qrawfont.cpp')
| -rw-r--r-- | src/gui/text/qrawfont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index 0e8771b0ac..b74ce23631 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -688,7 +688,7 @@ extern int qt_script_for_writing_system(QFontDatabase::WritingSystem writingSyst QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writingSystem) { QRawFont rawFont; - QFontPrivate *font_d = QFontPrivate::get(font); + const QFontPrivate *font_d = QFontPrivate::get(font); int script = qt_script_for_writing_system(writingSystem); QFontEngine *fe = font_d->engineForScript(script); |