diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-07 17:49:43 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-21 20:35:29 +0200 |
| commit | 1c80d056e4f45b4ee7c4863cd792e83c889513c5 (patch) | |
| tree | fce424d5dcc18710bd88a479ec48c443209a1115 /src/widgets/widgets/qtoolbutton.cpp | |
| parent | fbb7c98e91ec9a0a253864d7621ee7ec73b1a480 (diff) | |
Port QT_NO_TOOLTIP to QT_CONFIG(tooltip)
We remove the QT_NO_TOOLTIP check from qstandarditemmodel.h, because as
the 'tooltip' feature is in QtWidgets, we cannot use it properly in
QtGui. Also this affects just two non-virtual inline methods, i.e. it
has no effect on library size.
Task-number: QTBUG-82785
Change-Id: Ic166f14fb1cf3e9dd789573a6b9db6a87fb50e10
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/widgets/widgets/qtoolbutton.cpp')
| -rw-r--r-- | src/widgets/widgets/qtoolbutton.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 410c326d51..e8cb502650 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -49,7 +49,9 @@ #include <qpointer.h> #include <qstyle.h> #include <qstyleoption.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #if QT_CONFIG(mainwindow) #include <qmainwindow.h> #endif @@ -944,7 +946,7 @@ void QToolButton::setDefaultAction(QAction *action) buttonText.replace(QLatin1String("&"), QLatin1String("&&")); setText(buttonText); setIcon(action->icon()); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) setToolTip(action->toolTip()); #endif #if QT_CONFIG(statustip) |