summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebframe.cpp16
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebframe.h5
2 files changed, 20 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp
index eb7821d53..e8faab881 100644
--- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp
@@ -1164,7 +1164,11 @@ QUrl QWebHitTestResult::linkUrl() const
return d->linkUrl;
}
+#if QT_DEPRECATED_SINCE(5,5)
/*!
+ \obsolete
+ Use linkTitleString instead.
+
Returns the title of the link.
*/
QUrl QWebHitTestResult::linkTitle() const
@@ -1173,6 +1177,18 @@ QUrl QWebHitTestResult::linkTitle() const
return QUrl();
return d->linkTitle;
}
+#endif // QT_DEPRECATED_SINCE(5,5)
+
+/*!
+ \since 5.5
+ Returns the title of the link.
+*/
+QString QWebHitTestResult::linkTitleString() const
+{
+ if (!d)
+ return QString();
+ return d->linkTitle;
+}
/*!
\since 4.6
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h
index d665bd12f..619594336 100644
--- a/Source/WebKit/qt/WidgetApi/qwebframe.h
+++ b/Source/WebKit/qt/WidgetApi/qwebframe.h
@@ -79,7 +79,10 @@ public:
QString linkText() const;
QUrl linkUrl() const;
- QUrl linkTitle() const;
+#if QT_DEPRECATED_SINCE(5,5)
+ QT_DEPRECATED QUrl linkTitle() const;
+#endif // QT_DEPRECATED_SINCE(5,5)
+ QString linkTitleString() const;
QWebFrame *linkTargetFrame() const;
QWebElement linkElement() const;