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/gui/itemmodels/qstandarditemmodel.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/gui/itemmodels/qstandarditemmodel.h') diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index f1c6e6df5c..a66054a04f 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -79,12 +79,10 @@ public: } inline void setIcon(const QIcon &icon); -#ifndef QT_NO_TOOLTIP inline QString toolTip() const { return qvariant_cast(data(Qt::ToolTipRole)); } inline void setToolTip(const QString &toolTip); -#endif #ifndef QT_NO_STATUSTIP inline QString statusTip() const { @@ -260,10 +258,8 @@ inline void QStandardItem::setText(const QString &atext) inline void QStandardItem::setIcon(const QIcon &aicon) { setData(aicon, Qt::DecorationRole); } -#ifndef QT_NO_TOOLTIP inline void QStandardItem::setToolTip(const QString &atoolTip) { setData(atoolTip, Qt::ToolTipRole); } -#endif #ifndef QT_NO_STATUSTIP inline void QStandardItem::setStatusTip(const QString &astatusTip) -- cgit v1.2.3