Add QPlatformBackingStore::toImage() implementations

On platforms where it makes sense, add the implementation that makes
returning a QImage possible.  This makes it possible to grab raster
windows.

Change-Id: I89241728aa6f7811c56bb66cd86a64aa961d71f8
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

src/platformsupport/fbconvenience/qfbbackingstore.cpp

@@ -80,6 +80,12 @@ const QImage QFbBackingStore::image()
     return mImage;
 }
 
+
+QImage QFbBackingStore::toImage() const
+{
+    return mImage;
+}
+
 void QFbBackingStore::lock()
 {
     mImageMutex.lock();
@@ -101,4 +107,3 @@ void QFbBackingStore::endPaint()
 }
 
 QT_END_NAMESPACE
-

src/platformsupport/fbconvenience/qfbbackingstore_p.h

@@ -72,6 +72,7 @@ public:
     void resize(const QSize &size, const QRegion &region) Q_DECL_OVERRIDE;
 
     const QImage image();
+    QImage toImage() const override;
 
     void lock();
     void unlock();

src/plugins/platforms/cocoa/qcocoabackingstore.h

@@ -57,11 +57,8 @@ public:
 
     QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
     void flush(QWindow *widget, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
-#ifndef QT_NO_OPENGL
     QImage toImage() const Q_DECL_OVERRIDE;
-#else
-    QImage toImage() const; // No QPlatformBackingStore::toImage() for NO_OPENGL builds.
-#endif
+
     void resize (const QSize &size, const QRegion &) Q_DECL_OVERRIDE;
     bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE;
     void beginPaint(const QRegion &region) Q_DECL_OVERRIDE;

src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp

@@ -132,4 +132,9 @@ void QWindowsDirect2DBackingStore::resize(const QSize &size, const QRegion &regi
     }
 }
 
+QImage QWindowsDirect2DBackingStore::toImage() const
+{
+    return nativeWindow(window())->pixmap()->toImage();
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h

@@ -60,6 +60,8 @@ public:
     QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
     void flush(QWindow *targetWindow, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
     void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
+
+    QImage toImage() const override;
 };
 
 QT_END_NAMESPACE

src/plugins/platforms/directfb/qdirectfbbackingstore.cpp

@@ -112,4 +112,9 @@ bool QDirectFbBackingStore::scroll(const QRegion &area, int dx, int dy)
     return true;
 }
 
+QImage QDirectFbBackingStore::toImage() const
+{
+    return m_pixmap.data()->toImage();
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/directfb/qdirectfbbackingstore.h

@@ -59,6 +59,8 @@ public:
     void resize (const QSize &size, const QRegion &staticContents);
     bool scroll(const QRegion &area, int dx, int dy);
 
+    QImage toImage() const override;
+
 private:
     void lockSurfaceToImage();
 

src/plugins/platforms/windows/qwindowsbackingstore.cpp

@@ -210,8 +210,6 @@ HDC QWindowsBackingStore::getDC() const
     return 0;
 }
 
-#ifndef QT_NO_OPENGL
-
 QImage QWindowsBackingStore::toImage() const
 {
     if (m_image.isNull()) {
@@ -221,6 +219,4 @@ QImage QWindowsBackingStore::toImage() const
     return m_image.data()->image();
 }
 
-#endif // !QT_NO_OPENGL
-
 QT_END_NAMESPACE

src/plugins/platforms/windows/qwindowsbackingstore.h

@@ -65,9 +65,7 @@ public:
 
     HDC getDC() const;
 
-#ifndef QT_NO_OPENGL
     QImage toImage() const Q_DECL_OVERRIDE;
-#endif
 
 private:
     QScopedPointer<QWindowsNativeImage> m_image;

src/plugins/platforms/xcb/qxcbbackingstore.cpp

@@ -549,12 +549,10 @@ void QXcbBackingStore::endPaint()
     }
 }
 
-#ifndef QT_NO_OPENGL
 QImage QXcbBackingStore::toImage() const
 {
     return m_image && m_image->image() ? *m_image->image() : QImage();
 }
-#endif
 
 QPlatformGraphicsBuffer *QXcbBackingStore::graphicsBuffer() const
 {

src/plugins/platforms/xcb/qxcbbackingstore.h

@@ -62,8 +62,8 @@ public:
     void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
                          QPlatformTextureList *textures, QOpenGLContext *context,
                          bool translucentBackground) Q_DECL_OVERRIDE;
-    QImage toImage() const Q_DECL_OVERRIDE;
 #endif
+    QImage toImage() const Q_DECL_OVERRIDE;
 
     QPlatformGraphicsBuffer *graphicsBuffer() const Q_DECL_OVERRIDE;