diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-07-28 16:35:16 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-07-30 12:45:12 +0200 |
commit | a99922affdc7953f092dcfcf34ea741567a5bddc (patch) | |
tree | 3c6a0c272060c4e35b345e17803d76c4e29b641e /examples/webenginewidgets/browser/browserapplication.cpp | |
parent | e1b98a164799d90f51336c718724fe8e6db01568 (diff) |
Add api to get the favicon URL
Adds one of the missing pieces of the QWebFrame and QWebView APIs.
Unlike the QtWebKit version this only fetches the favicon URL, and not
the icon. This is because we do not want to implement an icon database,
and that the icon would be loaded asynchronous anyway, bringing no
guarantee to be a valid icon/image yet.
Change-Id: I227311ae3676044da850e687b82bee752b5079c8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'examples/webenginewidgets/browser/browserapplication.cpp')
-rw-r--r-- | examples/webenginewidgets/browser/browserapplication.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/examples/webenginewidgets/browser/browserapplication.cpp b/examples/webenginewidgets/browser/browserapplication.cpp index d1563ef05..89fc698a7 100644 --- a/examples/webenginewidgets/browser/browserapplication.cpp +++ b/examples/webenginewidgets/browser/browserapplication.cpp @@ -74,7 +74,7 @@ DownloadManager *BrowserApplication::s_downloadManager = 0; HistoryManager *BrowserApplication::s_historyManager = 0; -NetworkAccessManager *BrowserApplication::s_networkAccessManager = 0; +QNetworkAccessManager *BrowserApplication::s_networkAccessManager = 0; BookmarksManager *BrowserApplication::s_bookmarksManager = 0; BrowserApplication::BrowserApplication(int &argc, char **argv) @@ -433,7 +433,7 @@ DownloadManager *BrowserApplication::downloadManager() return s_downloadManager; } -NetworkAccessManager *BrowserApplication::networkAccessManager() +QNetworkAccessManager *BrowserApplication::networkAccessManager() { #if defined(QWEBENGINEPAGE_SETNETWORKACCESSMANAGER) if (!s_networkAccessManager) { @@ -442,7 +442,10 @@ NetworkAccessManager *BrowserApplication::networkAccessManager() } return s_networkAccessManager; #else - return 0; + if (!s_networkAccessManager) { + s_networkAccessManager = new QNetworkAccessManager(); + } + return s_networkAccessManager; #endif } @@ -468,7 +471,12 @@ QIcon BrowserApplication::icon(const QUrl &url) const if (!icon.isNull()) return icon.pixmap(16, 16); #endif + return defaultIcon(); +} + +QIcon BrowserApplication::defaultIcon() const +{ if (m_defaultIcon.isNull()) m_defaultIcon = QIcon(QLatin1String(":defaulticon.png")); - return m_defaultIcon.pixmap(16, 16); + return m_defaultIcon; } |