diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-10 05:06:04 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-10 05:06:04 (GMT) |
| commit | 6ac64e4b8d7cb86394936a4d5723625bcabf2f59 (patch) | |
| tree | 442f408c9f4071445628c3035470288049fccc95 /src/3rdparty | |
| parent | 5471328d6565ca1759ea8008421a31dde2a0f036 (diff) | |
| download | Qt-6ac64e4b8d7cb86394936a4d5723625bcabf2f59.zip Qt-6ac64e4b8d7cb86394936a4d5723625bcabf2f59.tar.gz Qt-6ac64e4b8d7cb86394936a4d5723625bcabf2f59.tar.bz2 | |
Remove WebView::pagewidth and tidy up - it's not needed and interfered
with zoomFactor.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index f706d77..b580116 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -1238,7 +1238,8 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize, parentWidget = qobject_cast<QWidget*>(m_webFrame->page()->d->client->pluginParent()); else parentWidget = 0; // The plug-in won't be fully functional because the QWebView doesn't exist. - widget->setParent(parentWidget); + if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent createPlugin() chose. + widget->setParent(parentWidget); RefPtr<QtPluginWidget> w = adoptRef(new QtPluginWidget()); w->setPlatformWidget(widget); // Make sure it's invisible until properly placed into the layout |