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/widgets/qtoolbarseparator_p.h | |
| parent | 8b098e6544221a96bc6a41a6bfcc0dfa7cf805e6 (diff) | |
| parent | 364bd6ca74b059ffe8ae367e1562645a3ed0855e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a
Diffstat (limited to 'src/widgets/widgets/qtoolbarseparator_p.h')
| -rw-r--r-- | src/widgets/widgets/qtoolbarseparator_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h index d52b4fa6ae..60b51a28cb 100644 --- a/src/widgets/widgets/qtoolbarseparator_p.h +++ b/src/widgets/widgets/qtoolbarseparator_p.h @@ -54,9 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qwidget.h" -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbar); -#ifndef QT_NO_TOOLBAR +QT_BEGIN_NAMESPACE class QStyleOption; class QToolBar; @@ -80,8 +80,6 @@ public Q_SLOTS: void setOrientation(Qt::Orientation orientation); }; -#endif // QT_NO_TOOLBAR - QT_END_NAMESPACE #endif // QDYNAMICTOOLBARSEPARATOR_P_H |