diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-05 08:32:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-05 08:32:25 (GMT) |
| commit | 42318a57e95a875b2168ca027679d9258fcc929b (patch) | |
| tree | 88217a1a9df26fc0ec7f4af83607c727c9944b38 /src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp | |
| parent | 09f07b98dfdaec2e48749768b967a48e588d3f7f (diff) | |
| parent | 739d4460d28d0ebcde4e5960f533c2a7554049f6 (diff) | |
| download | Qt-42318a57e95a875b2168ca027679d9258fcc929b.zip Qt-42318a57e95a875b2168ca027679d9258fcc929b.tar.gz Qt-42318a57e95a875b2168ca027679d9258fcc929b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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 c4d240c..b63921b 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp @@ -117,6 +117,8 @@ public: virtual QStyle* style() const; + virtual bool viewResizesToContentsEnabled() const { return resizesToContents; } + #if USE(ACCELERATED_COMPOSITING) virtual void setRootGraphicsLayer(QGraphicsItem* layer); virtual void markForSync(bool scheduleSync); |