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/qwidgettextcontrol.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/qwidgettextcontrol.cpp')
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 41932214c1..e32f779bb0 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -84,7 +84,9 @@ #include <qurl.h> #include <qdesktopservices.h> #include <qinputmethod.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #include <qstyleoption.h> #if QT_CONFIG(lineedit) #include <QtWidgets/qlineedit.h> @@ -1074,13 +1076,13 @@ void QWidgetTextControl::processEvent(QEvent *e, const QTransform &transform, QW d->isEnabled = e->isAccepted(); break; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::ToolTip: { QHelpEvent *ev = static_cast<QHelpEvent *>(e); d->showToolTip(ev->globalPos(), transform.map(ev->pos()), contextWidget); break; } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) #if QT_CONFIG(draganddrop) case QEvent::DragEnter: { @@ -2948,7 +2950,7 @@ void QWidgetTextControlPrivate::activateLinkUnderCursor(QString href) emit q_func()->linkActivated(href); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void QWidgetTextControlPrivate::showToolTip(const QPoint &globalPos, const QPointF &pos, QWidget *contextWidget) { const QString toolTip = q_func()->cursorForPosition(pos).charFormat().toolTip(); @@ -2956,7 +2958,7 @@ void QWidgetTextControlPrivate::showToolTip(const QPoint &globalPos, const QPoin return; QToolTip::showText(globalPos, toolTip, contextWidget); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) bool QWidgetTextControlPrivate::isPreediting() const { |