diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/qt/Api/qwebsettings.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/qt/Api/qwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index ebecc7f5d..ba7187df7 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -723,12 +723,12 @@ void QWebSettings::clearIconDatabase() QIcon QWebSettings::iconForUrl(const QUrl& url) { WebCore::initializeWebCoreQt(); - QImage* icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(WebCore::KURL(url).string(), + QPixmap* icon = WebCore::iconDatabase().synchronousNativeIconForPageURL(WebCore::KURL(url).string(), WebCore::IntSize(16, 16)); if (!icon) return QIcon(); - return QPixmap::fromImage(*icon); + return* icon; } /* @@ -771,7 +771,7 @@ static const char* resourceNameForWebGraphic(QWebSettings::WebGraphic type) void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap& graphic) { WebCore::initializeWebCoreQt(); - WebCore::Image::setPlatformResource(resourceNameForWebGraphic(type), graphic.toImage()); + WebCore::Image::setPlatformResource(resourceNameForWebGraphic(type), graphic); } /*! @@ -786,10 +786,10 @@ QPixmap QWebSettings::webGraphic(WebGraphic type) RefPtr<WebCore::Image> img = WebCore::Image::loadPlatformResource(resourceNameForWebGraphic(type)); if (!img) return QPixmap(); - QImage* image = img->nativeImageForCurrentFrame(); - if (!image) + QPixmap* pixmap = img->nativeImageForCurrentFrame(); + if (!pixmap) return QPixmap(); - return QPixmap::fromImage(*image); + return *pixmap; } /*! |