From a99922affdc7953f092dcfcf34ea741567a5bddc Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Mon, 28 Jul 2014 16:35:16 +0200
Subject: 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>
---
 examples/webenginewidgets/browser/browserapplication.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'examples/webenginewidgets/browser/browserapplication.h')

diff --git a/examples/webenginewidgets/browser/browserapplication.h b/examples/webenginewidgets/browser/browserapplication.h
index b17f1cea5..777bef06e 100644
--- a/examples/webenginewidgets/browser/browserapplication.h
+++ b/examples/webenginewidgets/browser/browserapplication.h
@@ -51,6 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 class QLocalServer;
+class QNetworkAccessManager;
 QT_END_NAMESPACE
 
 class BookmarksManager;
@@ -58,7 +59,6 @@ class BrowserMainWindow;
 class CookieJar;
 class DownloadManager;
 class HistoryManager;
-class NetworkAccessManager;
 class BrowserApplication : public QApplication
 {
     Q_OBJECT
@@ -73,6 +73,7 @@ public:
     BrowserMainWindow *mainWindow();
     QList<BrowserMainWindow*> mainWindows();
     QIcon icon(const QUrl &url) const;
+    QIcon defaultIcon() const;
 
     void saveSession();
     bool canRestoreSession() const;
@@ -80,7 +81,7 @@ public:
     static HistoryManager *historyManager();
     static CookieJar *cookieJar();
     static DownloadManager *downloadManager();
-    static NetworkAccessManager *networkAccessManager();
+    static QNetworkAccessManager *networkAccessManager();
     static BookmarksManager *bookmarksManager();
 
 #if defined(Q_WS_MAC)
@@ -106,7 +107,7 @@ private:
 
     static HistoryManager *s_historyManager;
     static DownloadManager *s_downloadManager;
-    static NetworkAccessManager *s_networkAccessManager;
+    static QNetworkAccessManager *s_networkAccessManager;
     static BookmarksManager *s_bookmarksManager;
 
     QList<QPointer<BrowserMainWindow> > m_mainWindows;
-- 
cgit v1.2.3