diff options
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
-rw-r--r-- | src/gui/painting/qpainter.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index ef21cacdf2..12c7929047 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1347,14 +1347,7 @@ void QPainterPrivate::updateState(QPainterState *newState) and embedded devices supporting the OpenGL 2.0 or OpenGL/ES 2.0 specification. This includes most graphics chips produced in the last couple of years. The engine can be enabled by using QPainter - onto a QOpenGLWidget or by passing \c {-graphicssystem opengl} on the - command line when the underlying system supports it. - - \li OpenVG - This backend implements the Khronos standard for 2D - and Vector Graphics. It is primarily for embedded devices with - hardware support for OpenVG. The engine can be enabled by - passing \c {-graphicssystem openvg} on the command line when - the underlying system supports it. + onto a QOpenGLWidget. \endlist @@ -7439,10 +7432,6 @@ start_lengthVariant: } } - // no need to do extra work for underlines if we don't paint - if (tf & Qt::TextDontPrint) - maxUnderlines = 0; - QList<QTextLayout::FormatRange> underlineFormats; int length = offset - old_offset; if ((hidemnmemonic || showmnemonic) && maxUnderlines > 0) { @@ -7457,7 +7446,7 @@ start_lengthVariant: --l; if (!l) break; - if (*cin != QLatin1Char('&') && !hidemnmemonic) { + if (*cin != QLatin1Char('&') && !hidemnmemonic && !(tf & Qt::TextDontPrint)) { QTextLayout::FormatRange range; range.start = cout - cout0; range.length = 1; |