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/qwidget.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/qwidget.h')
| -rw-r--r-- | src/widgets/kernel/qwidget.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 8ca75b67b0..d13e273292 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -182,7 +182,7 @@ class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice Q_PROPERTY(QString windowIconText READ windowIconText WRITE setWindowIconText NOTIFY windowIconTextChanged) // deprecated Q_PROPERTY(double windowOpacity READ windowOpacity WRITE setWindowOpacity) Q_PROPERTY(bool windowModified READ isWindowModified WRITE setWindowModified) -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) Q_PROPERTY(QString toolTip READ toolTip WRITE setToolTip) Q_PROPERTY(int toolTipDuration READ toolTipDuration WRITE setToolTipDuration) #endif @@ -382,7 +382,7 @@ public: qreal windowOpacity() const; bool isWindowModified() const; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void setToolTip(const QString &); QString toolTip() const; void setToolTipDuration(int msec); |