diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-28 12:58:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-28 12:58:02 (GMT) |
commit | d00b63a4a7a1b962657aebefc3167a62cc93ade6 (patch) | |
tree | 8438f4f92b00eb876c0932d3a5f1af9326b5cbf5 /src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp | |
parent | 4bd7a5df86f1292ad2acaa16a9e9c493c94a9c79 (diff) | |
parent | 8e42bd0f273f5e0ae10fbc04ad49dc8d2e5b4655 (diff) | |
download | Qt-d00b63a4a7a1b962657aebefc3167a62cc93ade6.zip Qt-d00b63a4a7a1b962657aebefc3167a62cc93ade6.tar.gz Qt-d00b63a4a7a1b962657aebefc3167a62cc93ade6.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp index 7a25646..c4d240c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp @@ -442,6 +442,8 @@ QRectF QGraphicsWebViewPrivate::graphicsItemVisibleRect() const #if ENABLE(TILED_BACKING_STORE) void QGraphicsWebViewPrivate::updateTiledBackingStoreScale() { + if (!page) + return; WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page->mainFrame())->tiledBackingStore(); if (!backingStore) return; |