diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-04-30 02:51:44 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-04-30 02:51:44 (GMT) |
| commit | e3c91e87a06b73a06c86f93c69951768874bbaf6 (patch) | |
| tree | 50585ecb396d4e662e1de6a62c297eaa099c0b6d /src/declarative/fx/qfxwebview.cpp | |
| parent | e5ded2fb2c819be430444ac2ca90e703751eaee7 (diff) | |
| download | Qt-e3c91e87a06b73a06c86f93c69951768874bbaf6.zip Qt-e3c91e87a06b73a06c86f93c69951768874bbaf6.tar.gz Qt-e3c91e87a06b73a06c86f93c69951768874bbaf6.tar.bz2 | |
Fix crash
Continues d62bc81491b4b3ef76d626fd56f736427ee1e20c
Diffstat (limited to 'src/declarative/fx/qfxwebview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxwebview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index b2ad06c..7c05088 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -1018,11 +1018,11 @@ QString QFxWebView::html() const void QFxWebView::setHtml(const QString &html, const QUrl &baseUrl) { Q_D(QFxWebView); - d->page->setViewportSize(QSize( + page()->setViewportSize(QSize( d->idealwidth>0 ? d->idealwidth : width(), d->idealheight>0 ? d->idealheight : height())); if (isComponentComplete()) - d->page->mainFrame()->setHtml(html, baseUrl); + page()->mainFrame()->setHtml(html, baseUrl); else { d->pending = d->PendingHtml; d->pending_url = baseUrl; @@ -1033,12 +1033,12 @@ void QFxWebView::setHtml(const QString &html, const QUrl &baseUrl) void QFxWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl) { Q_D(QFxWebView); - d->page->setViewportSize(QSize( + page()->setViewportSize(QSize( d->idealwidth>0 ? d->idealwidth : width(), d->idealheight>0 ? d->idealheight : height())); if (isComponentComplete()) - d->page->mainFrame()->setContent(data,mimeType,baseUrl); + page()->mainFrame()->setContent(data,mimeType,baseUrl); else { d->pending = d->PendingContent; d->pending_url = baseUrl; |