1 files changed, 16 insertions, 30 deletions

diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 3e49390315..dac7a9a608 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -152,6 +152,11 @@ public:
     QTextCursor prevFocus;
     int lastKeypadScrollValue;
 #endif
+    void emitHighlighted(const QUrl &url)
+    {
+        Q_Q(QTextBrowser);
+        emit q->highlighted(url);
+    }
 };
 Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_MOVABLE_TYPE);
 
@@ -256,24 +261,20 @@ void QTextBrowserPrivate::_q_activateAnchor(const QString &href)
 
 void QTextBrowserPrivate::_q_highlightLink(const QString &anchor)
 {
-    Q_Q(QTextBrowser);
     if (anchor.isEmpty()) {
 #ifndef QT_NO_CURSOR
         if (viewport->cursor().shape() != Qt::PointingHandCursor)
             oldCursor = viewport->cursor();
         viewport->setCursor(oldCursor);
 #endif
-        emit q->highlighted(QUrl());
-        emit q->highlighted(QString());
+        emitHighlighted(QUrl());
     } else {
 #ifndef QT_NO_CURSOR
         viewport->setCursor(Qt::PointingHandCursor);
 #endif
 
         const QUrl url = resolveUrl(anchor);
-        emit q->highlighted(url);
-        // convenience to ease connecting to QStatusBar::showMessage(const QString &)
-        emit q->highlighted(url.toString());
+        emitHighlighted(url);
     }
 }
 
@@ -310,9 +311,9 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType
     if (url.isValid()
         && (newUrlWithoutFragment != currentUrlWithoutFragment || forceLoadOnSourceChange)) {
         QVariant data = q->loadResource(type, resolveUrl(url));
-        if (data.type() == QVariant::String) {
+        if (data.userType() == QMetaType::QString) {
             txt = data.toString();
-        } else if (data.type() == QVariant::ByteArray) {
+        } else if (data.userType() == QMetaType::QByteArray) {
             if (type == QTextDocument::HtmlResource) {
 #if QT_CONFIG(textcodec)
                 QByteArray ba = data.toByteArray();
@@ -383,8 +384,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType
     }
 #ifdef QT_KEYPAD_NAVIGATION
     lastKeypadScrollValue = vbar->value();
-    emit q->highlighted(QUrl());
-    emit q->highlighted(QString());
+    emitHighlighted(QUrl());
 #endif
 
 #ifndef QT_NO_CURSOR
@@ -559,8 +559,7 @@ void QTextBrowserPrivate::keypadMove(bool next)
         // Ensure that the new selection is highlighted.
         const QString href = control->anchorAtCursor();
         QUrl url = resolveUrl(href);
-        emit q->highlighted(url);
-        emit q->highlighted(url.toString());
+        emitHighlighted(url);
     } else {
         // Scroll
         vbar->setValue(scrollYOffset);
@@ -575,8 +574,7 @@ void QTextBrowserPrivate::keypadMove(bool next)
         hbar->setValue(savedXOffset);
         vbar->setValue(scrollYOffset);
 
-        emit q->highlighted(QUrl());
-        emit q->highlighted(QString());
+        emitHighlighted(QUrl());
     }
 }
 #endif
@@ -619,8 +617,7 @@ void QTextBrowserPrivate::restoreHistoryEntry(const HistoryEntry &entry)
     Q_Q(QTextBrowser);
     const QString href = prevFocus.charFormat().anchorHref();
     QUrl url = resolveUrl(href);
-    emit q->highlighted(url);
-    emit q->highlighted(url.toString());
+    emitHighlighted(url);
 #endif
 }
 
@@ -823,7 +820,7 @@ void QTextBrowser::setSource(const QUrl &url)
 /*!
     Attempts to load the document at the given \a url with the specified \a type.
 
-    If \a type is \l {QTextDocument::ResourceType::UnknownResource}{UnknownResource}
+    If \a type is \l {QTextDocument::UnknownResource}{UnknownResource}
     (the default), the document type will be detected: that is, if the url ends
     with an extension of \c{.md}, \c{.mkd} or \c{.markdown}, the document will be
     loaded via \l QTextDocument::setMarkdown(); otherwise it will be loaded via
@@ -925,15 +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
-
-     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)
 
@@ -1127,8 +1115,7 @@ bool QTextBrowser::focusNextPrevChild(bool next)
         if (d->prevFocus != d->control->textCursor() && d->control->textCursor().hasSelection()) {
             const QString href = d->control->anchorAtCursor();
             QUrl url = d->resolveUrl(href);
-            emit highlighted(url);
-            emit highlighted(url.toString());
+            emitHighlighted(url);
         }
         d->prevFocus = d->control->textCursor();
 #endif
@@ -1136,8 +1123,7 @@ bool QTextBrowser::focusNextPrevChild(bool next)
     } else {
 #ifdef QT_KEYPAD_NAVIGATION
         // We assume we have no highlight now.
-        emit highlighted(QUrl());
-        emit highlighted(QString());
+        emitHighlighted(QUrl());
 #endif
     }
     return QTextEdit::focusNextPrevChild(next);