diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-07 13:12:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-07 13:19:27 +0200 |
| commit | 9967a011eaae8988b10e56fde0f2ab8b6bab90ac (patch) | |
| tree | 353b932414a8d9d94a418e84068550b0a2376b37 /src/widgets/widgets/qwidgettextcontrol.cpp | |
| parent | 91ab70d17f892f3ff6b2019632fda3920d045dcb (diff) | |
| parent | 99636127d10f96d8313bc26030cabf9841381914 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
qmake/generators/makefile.cpp
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoaintegration.mm
Done-With: Jörg Bornemann <joerg.bornemann@qt.io>
Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 07d631cfe9..f86a747b0f 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -61,6 +61,9 @@ #include "private/qtextdocument_p.h" #include "qtextlist.h" #include "private/qwidgettextcontrol_p.h" +#if QT_CONFIG(style_stylesheet) +# include "private/qstylesheetstyle_p.h" +#endif #if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" #endif @@ -3198,6 +3201,15 @@ QAbstractTextDocumentLayout::PaintContext QWidgetTextControl::getPaintContext(QW ctx.selections = d->extraSelections; ctx.palette = d->palette; +#if QT_CONFIG(style_stylesheet) + if (widget) { + if (auto cssStyle = qt_styleSheet(widget->style())) { + QStyleOption option; + option.initFrom(widget); + cssStyle->styleSheetPalette(widget, &option, &ctx.palette); + } + } +#endif // style_stylesheet if (d->cursorOn && d->isEnabled) { if (d->hideCursor) ctx.cursorPosition = -1; |