summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/browser/browserapplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/webenginewidgets/browser/browserapplication.cpp')
-rw-r--r--examples/webenginewidgets/browser/browserapplication.cpp16
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;
}