Skip to content

Commit 4efa70d

Browse files
committed
assign network access manager to QWebPages (fixes #10189)
1 parent 90f0721 commit 4efa70d

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

src/core/composer/qgscomposerhtml.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#include "qgscomposerframe.h"
1818
#include "qgscomposition.h"
1919
#include "qgsaddremovemultiframecommand.h"
20+
#include "qgsnetworkaccessmanager.h"
21+
2022
#include <QCoreApplication>
2123
#include <QPainter>
2224
#include <QWebFrame>
@@ -32,6 +34,7 @@ QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ):
3234
{
3335
mHtmlUnitsToMM = htmlUnitsToMM();
3436
mWebPage = new QWebPage();
37+
mWebPage->setNetworkAccessManager( QgsNetworkAccessManager::instance() );
3538
QObject::connect( mWebPage, SIGNAL( loadFinished( bool ) ), this, SLOT( frameLoaded( bool ) ) );
3639
if ( mComposition )
3740
{

src/core/composer/qgscomposerlabel.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include "qgscomposerlabel.h"
1919
#include "qgscomposition.h"
2020
#include "qgsexpression.h"
21+
#include "qgsnetworkaccessmanager.h"
22+
2123
#include <QCoreApplication>
2224
#include <QDate>
2325
#include <QDomElement>
@@ -87,7 +89,8 @@ void QgsComposerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem*
8789
{
8890
painter->scale( 1.0 / mHtmlUnitsToMM / 10.0, 1.0 / mHtmlUnitsToMM / 10.0 );
8991

90-
QWebPage* webPage = new QWebPage();
92+
QWebPage *webPage = new QWebPage();
93+
webPage->setNetworkAccessManager( QgsNetworkAccessManager::instance() );
9194

9295
//Setup event loop and timeout for rendering html
9396
QEventLoop loop;

src/gui/qgshtmlannotationitem.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "qgsmaptool.h"
2525
#include "qgsvectorlayer.h"
2626
#include "qgsexpression.h"
27+
#include "qgsnetworkaccessmanager.h"
2728

2829
#include <QDomElement>
2930
#include <QDir>
@@ -40,6 +41,8 @@ QgsHtmlAnnotationItem::QgsHtmlAnnotationItem( QgsMapCanvas* canvas, QgsVectorLay
4041
mHasAssociatedFeature( hasFeature ), mFeatureId( feature )
4142
{
4243
mWebView = new QWebView();
44+
mWebView->page()->setNetworkAccessManager( QgsNetworkAccessManager::instance() );
45+
4346
mWidgetContainer = new QGraphicsProxyWidget( this );
4447
mWidgetContainer->setWidget( mWebView );
4548

0 commit comments

Comments
 (0)