diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-02-12 08:47:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-02-12 08:47:47 +0000 |
| commit | f4a52b79ced0726b207c1af8c12ada1f8be12ff0 (patch) | |
| tree | d11ec8434ee3c61ddc1f0d04009cfc478ec05af5 /src/widgets/widgets/qtextbrowser.cpp | |
| parent | 99da0c164b02dca8f556c3186231e6b0723c532c (diff) | |
| parent | c53f8c038c0736aeb208bcd69bf3b5e2816c29ae (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'src/widgets/widgets/qtextbrowser.cpp')
| -rw-r--r-- | src/widgets/widgets/qtextbrowser.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 78fde94fad..dac7a9a608 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -156,11 +156,6 @@ public: { Q_Q(QTextBrowser); emit q->highlighted(url); -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit q->highlighted(url.toString()); -#endif } }; Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_MOVABLE_TYPE); @@ -927,16 +922,6 @@ void QTextBrowser::doSetSource(const QUrl &url, QTextDocument::ResourceType type anchor is passed in \a link. */ -/*! \fn void QTextBrowser::highlighted(const QString &link) - \overload - \obsolete - - Convenience signal that allows connecting to a slot - that takes just a QString, like for example QStatusBar's - message(). -*/ - - /*! \fn void QTextBrowser::anchorClicked(const QUrl &link) |