diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-02 13:15:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-02 13:15:15 +0200 |
| commit | 7de400052f7df52095103f56f1cb753854be1af1 (patch) | |
| tree | 823c01302efd5d2181a3b3a55eb2937e52c849b1 /src/widgets/styles/qstyleoption.cpp | |
| parent | 8b098e6544221a96bc6a41a6bfcc0dfa7cf805e6 (diff) | |
| parent | 364bd6ca74b059ffe8ae367e1562645a3ed0855e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a
Diffstat (limited to 'src/widgets/styles/qstyleoption.cpp')
| -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 774c039ecc..97631a5841 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1040,7 +1040,7 @@ QStyleOptionButton::QStyleOptionButton(int version) */ -#ifndef QT_NO_TOOLBAR +#if QT_CONFIG(toolbar) /*! \class QStyleOptionToolBar \brief The QStyleOptionToolBar class is used to describe the |