diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 17:31:10 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-10 19:59:05 +0200 |
| commit | fa5ae7635660cc382d0b0ed3ce728433848e4ec3 (patch) | |
| tree | 503ef1644243249b155e5c340526d9ef02a290eb /src/widgets/kernel/qtooltip.h | |
| parent | ea09e2f466ce5ba072eb1b2e8259c4300c272fcd (diff) | |
Merge QToolTip::showText overloads as per ### Qt 6 comments
Change-Id: Ic156fed27bd535daf828e5d95049591833614307
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/widgets/kernel/qtooltip.h')
| -rw-r--r-- | src/widgets/kernel/qtooltip.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 9f786bdee1..c78e4c3251 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -50,10 +50,8 @@ class Q_WIDGETS_EXPORT QToolTip { QToolTip() = delete; public: - // ### Qt 6 - merge the three showText functions below - static void showText(const QPoint &pos, const QString &text, QWidget *w = nullptr); - static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect); - static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect, int msecShowTime); + static void showText(const QPoint &pos, const QString &text, + QWidget *w = nullptr, const QRect &rect = {}, int msecShowTime = -1); static inline void hideText() { showText(QPoint(), QString()); } static bool isVisible(); |