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/kernel/qtooltip.h | |
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/kernel/qtooltip.h')
-rw-r--r-- | src/widgets/kernel/qtooltip.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 1b263a6629..9f786bdee1 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -43,11 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> +QT_REQUIRE_CONFIG(tooltip); QT_BEGIN_NAMESPACE - -#ifndef QT_NO_TOOLTIP - class Q_WIDGETS_EXPORT QToolTip { QToolTip() = delete; @@ -67,8 +65,6 @@ public: static void setFont(const QFont &); }; -#endif // QT_NO_TOOLTIP - QT_END_NAMESPACE #endif // QTOOLTIP_H |