diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-14 12:07:41 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-16 21:47:29 +0200 |
commit | 6d1c4c8862161fd4aaffe307c7267ceeb408d8d8 (patch) | |
tree | 1bc2957bdb34af0ed943d3d24c47824edf70cb4a /src/gui/opengl/qopenglpaintdevice.cpp | |
parent | a4ac4b326318ed9034466305222280ed8d1651b5 (diff) |
Avoid breaking BC with new virtuals in QOpenGLPaintDevice
Task-number: QTBUG-41046
Change-Id: Iab628d2d6811d528e2cc513b6f8a74baa628541d
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/gui/opengl/qopenglpaintdevice.cpp')
-rw-r--r-- | src/gui/opengl/qopenglpaintdevice.cpp | 48 |
1 files changed, 9 insertions, 39 deletions
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp index c2f3295bc3..e908fd8e91 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -35,6 +35,7 @@ #include <qpaintengine.h> #include <qthreadstorage.h> +#include <private/qopenglpaintdevice_p.h> #include <private/qobject_p.h> #include <private/qopenglcontext_p.h> #include <private/qopenglframebufferobject_p.h> @@ -98,23 +99,6 @@ QT_BEGIN_NAMESPACE */ -class QOpenGLPaintDevicePrivate -{ -public: - QOpenGLPaintDevicePrivate(const QSize &size); - - QSize size; - QOpenGLContext *ctx; - - qreal dpmx; - qreal dpmy; - qreal devicePixelRatio; - - bool flipped; - - QPaintEngine *engine; -}; - /*! Constructs a QOpenGLPaintDevice. @@ -152,6 +136,14 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) } /*! + \internal + */ +QOpenGLPaintDevice::QOpenGLPaintDevice(QOpenGLPaintDevicePrivate *dd) + : d_ptr(dd) +{ +} + +/*! Destroys the QOpenGLPaintDevice. */ @@ -351,17 +343,6 @@ bool QOpenGLPaintDevice::paintFlipped() const } /*! - This virtual method is called when starting to paint. - - The default implementation does nothing. - - \sa endPaint() - */ -void QOpenGLPaintDevice::beginPaint() -{ -} - -/*! This virtual method is provided as a callback to allow re-binding a target frame buffer object or context when different QOpenGLPaintDevice instances are issuing draw calls alternately. @@ -375,15 +356,4 @@ void QOpenGLPaintDevice::ensureActiveTarget() { } -/*! - This virtual method is called when the painting has finished. - - The default implementation does nothing. - - \sa beginPaint() -*/ -void QOpenGLPaintDevice::endPaint() -{ -} - QT_END_NAMESPACE |