diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
| commit | ee71a9ba8169b9327b8dbaf2266ebeb515c64dbb (patch) | |
| tree | a2eb41c9b1b47ac8cd6f22c289f7227569ee0a5a /src/widgets/styles | |
| parent | d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 (diff) | |
| parent | 98f19f00361bf25097281cae5dfa833ba7db8a2f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/network/ssl/qsslsocket.cpp
src/widgets/kernel/qapplication.cpp
Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qstyleoption.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 1af839c841..5292d971ea 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1453,7 +1453,7 @@ QStyleOptionTab::QStyleOptionTab(int version) \value None A normal tab button. \value HasFrame The tab button is positioned on a tab frame - \sa features + \sa QStyleOptionToolBar::features */ /*! |