From a8fb55bea7b773f3f9d1a24550e5c823b63df388 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 7 Jul 2014 23:17:37 +0200 Subject: Mention Qt::ToolButtonFollowStyle in QToolBar/QMainWindow documentation Improve the existing docu for Qt::ToolButtonFollowStyle in QToolButton and show the same text in all other widgets that have toolButtonStyle property (QToolBar and QMainWindow). Change-Id: I26ff0ed332f8bd10b542a4111c6ae48a963d5667 Reviewed-by: Olivier Goffart Reviewed-by: Frederik Gladhorn --- src/widgets/widgets/qmainwindow.cpp | 4 ++++ src/widgets/widgets/qtoolbar.cpp | 4 ++++ src/widgets/widgets/qtoolbutton.cpp | 5 +++-- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 36ca90ba00..79f42a13ed 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -468,6 +468,10 @@ void QMainWindow::setIconSize(const QSize &iconSize) /*! \property QMainWindow::toolButtonStyle \brief style of toolbar buttons in this mainwindow. + To have the style of toolbuttons follow the system settings, set this property to Qt::ToolButtonFollowStyle. + On Unix, the user settings from the desktop environment will be used. + On other platforms, Qt::ToolButtonFollowStyle means icon only. + The default is Qt::ToolButtonIconOnly. */ diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 1c05529cd6..834c2fe56b 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -720,6 +720,10 @@ void QToolBar::setIconSize(const QSize &iconSize) as \l{QAction}s. Note that if you add a QToolButton with the addWidget() method, it will not get this button style. + To have the style of toolbuttons follow the system settings, set this property to Qt::ToolButtonFollowStyle. + On Unix, the user settings from the desktop environment will be used. + On other platforms, Qt::ToolButtonFollowStyle means icon only. + The default is Qt::ToolButtonIconOnly. */ diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 497bc52109..1b5ba8cd58 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -384,8 +384,9 @@ QSize QToolButton::minimumSizeHint() const The default is Qt::ToolButtonIconOnly. - To have the style of toolbuttons follow the system settings (as available - in GNOME and KDE desktop environments), set this property to Qt::ToolButtonFollowStyle. + To have the style of toolbuttons follow the system settings, set this property to Qt::ToolButtonFollowStyle. + On Unix, the user settings from the desktop environment will be used. + On other platforms, Qt::ToolButtonFollowStyle means icon only. QToolButton automatically connects this slot to the relevant signal in the QMainWindow in which is resides. -- cgit v1.2.3