From 1c80d056e4f45b4ee7c4863cd792e83c889513c5 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 7 Apr 2020 17:49:43 +0200 Subject: 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 Reviewed-by: Kai Koehne --- src/widgets/graphicsview/qgraphicsproxywidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/graphicsview/qgraphicsproxywidget.cpp') diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index 13b4638299d..42211c7ccff 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -890,7 +890,7 @@ bool QGraphicsProxyWidget::event(QEvent *event) } break; } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::GraphicsSceneHelp: { // Propagate the help event (for tooltip) to the widget under mouse if (d->lastWidgetUnderMouse) { @@ -981,7 +981,7 @@ bool QGraphicsProxyWidget::eventFilter(QObject *object, QEvent *event) d->styleChangeMode = QGraphicsProxyWidgetPrivate::NoMode; } break; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::ToolTipChange: // Propagate tooltip change to the proxy. if (!d->tooltipChangeMode) { -- cgit v1.2.3