1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile with -no-opengl

Browse Source 
QCocoaBackingstore::toImage() can only be Q_DECL_OVERRIDE
if QPlatformBackingStore::toImage() is present, which
it isn’t for NO_OPENGL builds.

Change-Id: Ib116f40fd26defb29a8d520d3e3fb104d8da8d57
Task-number: QTBUG-51694
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
This commit is contained in:
Morten Johan Sørvig 2016-03-11 12:48:11 +01:00
parent 5784c064a9
commit 1dcc53f6fa
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qcocoabackingstore.h
View File

@ -51,7 +51,11 @@ public:
QPaintDevice *paintDevice() Q_DECL_OVERRIDE; QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
void flush(QWindow *widget, const QRegion &region, const QPoint &offset) 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; 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; void resize (const QSize &size, const QRegion &) Q_DECL_OVERRIDE;
bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE; bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE;
void beginPaint(const QRegion &region) Q_DECL_OVERRIDE; void beginPaint(const QRegion &region) Q_DECL_OVERRIDE;