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/accessible | |
| 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/accessible')
| -rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index ce2ceac938..42074b63fb 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -57,7 +57,9 @@ #endif #include <qstyle.h> #include <qstyleoption.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #if QT_CONFIG(whatsthis) #include <qwhatsthis.h> #endif diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 1a7372728d..26341f805d 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -48,7 +48,9 @@ #if QT_CONFIG(label) #include "qlabel.h" #endif +#if QT_CONFIG(tooltip) #include "qtooltip.h" +#endif #if QT_CONFIG(whatsthis) #include "qwhatsthis.h" #endif @@ -425,7 +427,7 @@ QString QAccessibleWidget::text(QAccessible::Text t) const break; case QAccessible::Description: str = widget()->accessibleDescription(); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) if (str.isEmpty()) str = widget()->toolTip(); #endif diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index 107fd729fe..5b09143189 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -545,7 +545,7 @@ void *QAccessibleDisplay::interface_cast(QAccessible::InterfaceType t) /*! \internal */ QString QAccessibleDisplay::imageDescription() const { -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) return widget()->toolTip(); #else return QString(); |