diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:31:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:33:14 +0100 |
| commit | 03039979b5a643f9def38a73e19835bb69384202 (patch) | |
| tree | e8a9184d5963128f013247ac64ec768d1cbf6911 /src/widgets/styles | |
| parent | 9682d217e21a2e88b6de799d79b843bbe0039df1 (diff) | |
| parent | 4dc2bc323c985bdceb27f096dd6c8e7af657bb6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.
Conflicts:
qmake/generators/makefile.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
tests/auto/gui/text/qglyphrun/BLACKLIST
tests/auto/gui/text/qrawfont/BLACKLIST
Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/styles/qstyle.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index b146cb1183..d1767679f7 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -1679,7 +1679,8 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, alignment |= Qt::AlignLeft | Qt::AlignVCenter; } tr.translate(shiftX, shiftY); - const QString text = toolbutton->fontMetrics.elidedText(toolbutton->text, Qt::ElideMiddle, tr.width()); + const QString text = toolbutton->fontMetrics.elidedText(toolbutton->text, Qt::ElideMiddle, + tr.width(), alignment); proxy()->drawItemText(p, QStyle::visualRect(opt->direction, rect, tr), alignment, toolbutton->palette, toolbutton->state & State_Enabled, text, QPalette::ButtonText); diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 8006be8c27..ac4fb7fbd1 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -1998,7 +1998,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, This enum value has been introduced in Qt 5.10. \value SH_SpinBox_ButtonsInsideFrame - Determnines if the spin box buttons are inside the line edit frame. + Determines if the spin box buttons are inside the line edit frame. This enum value has been introduced in Qt 5.11. \value SH_SpinBox_StepModifier |