Title: [119924] trunk/Source/WebCore
- Revision
- 119924
- Author
- [email protected]
- Date
- 2012-06-10 05:09:37 -0700 (Sun, 10 Jun 2012)
Log Message
[Qt][Win] Fix building ImageQt.cpp
https://bugs.webkit.org/show_bug.cgi?id=88306
Reviewed by Simon Hausmann.
No new tests, this is just a build fix.
* platform/graphics/qt/ImageQt.cpp:
(WebCore):
(WebCore::BitmapImage::create):
Adapt to the "API" changes in Qt.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (119923 => 119924)
--- trunk/Source/WebCore/ChangeLog 2012-06-10 11:43:40 UTC (rev 119923)
+++ trunk/Source/WebCore/ChangeLog 2012-06-10 12:09:37 UTC (rev 119924)
@@ -1,3 +1,17 @@
+2012-06-10 Balazs Kelemen <[email protected]>
+
+ [Qt][Win] Fix building ImageQt.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=88306
+
+ Reviewed by Simon Hausmann.
+
+ No new tests, this is just a build fix.
+
+ * platform/graphics/qt/ImageQt.cpp:
+ (WebCore):
+ (WebCore::BitmapImage::create):
+ Adapt to the "API" changes in Qt.
+
2012-06-09 Gregg Tavares <[email protected]>
Make WebGL mark draws for compositing even if the draw count is zero
Modified: trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp (119923 => 119924)
--- trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2012-06-10 11:43:40 UTC (rev 119923)
+++ trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2012-06-10 12:09:37 UTC (rev 119924)
@@ -287,9 +287,20 @@
}
#if OS(WINDOWS)
+
+#if HAVE(QT5)
+Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP, int hbitmapFormat = 0);
+#endif
+
PassRefPtr<BitmapImage> BitmapImage::create(HBITMAP hBitmap)
{
- return BitmapImage::create(new QPixmap(QPixmap::fromWinHBITMAP(hBitmap)));
+#if HAVE(QT5)
+ QPixmap* qPixmap = new QPixmap(qt_pixmapFromWinHBITMAP(hBitmap));
+#else
+ QPixmap* qPixmap = new QPixmap(QPixmap::fromWinHBITMAP(hBitmap));
+#endif
+
+ return BitmapImage::create(qPixmap);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
