diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-07 10:31:03 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-09-08 11:07:56 +0200 |
| commit | 1b1831500142c995137f5e4b1bc03d21aa08e1e1 (patch) | |
| tree | 5fcd21ee23c37fbe3466fde353d0bcfd09a051e2 /src/gui/painting/qpaintdevice.h | |
| parent | 68974d8e647febb80a47d9cf6ce9452f3ce4fa21 (diff) | |
Improved and made public the QOpenGLPaintDevice API.
The new API is more flexible, allowing the use of QOpenGLPaintDevice
with any QOpenGLContext, and putting more responsibility on the user for
ensuring the correct FBO is current (the user knows best anyhow).
Task-number: QTBUG-21263
Change-Id: I50b954125f552baef52fbb3fe2ed907a11ad519c
Reviewed-on: http://codereview.qt-project.org/4325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/gui/painting/qpaintdevice.h')
| -rw-r--r-- | src/gui/painting/qpaintdevice.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index 0b44990c69..95509a9daa 100644 --- a/src/gui/painting/qpaintdevice.h +++ b/src/gui/painting/qpaintdevice.h @@ -79,15 +79,6 @@ public: bool paintingActive() const; virtual QPaintEngine *paintEngine() const = 0; -#if defined(Q_WS_QWS) - static QWSDisplay *qwsDisplay(); -#endif - -#ifdef Q_WS_WIN - virtual HDC getDC() const; - virtual void releaseDC(HDC hdc) const; -#endif - int width() const { return metric(PdmWidth); } int height() const { return metric(PdmHeight); } int widthMM() const { return metric(PdmWidthMM); } @@ -96,9 +87,6 @@ public: int logicalDpiY() const { return metric(PdmDpiY); } int physicalDpiX() const { return metric(PdmPhysicalDpiX); } int physicalDpiY() const { return metric(PdmPhysicalDpiY); } -#ifdef QT_DEPRECATED - QT_DEPRECATED int numColors() const { return metric(PdmNumColors); } -#endif int colorCount() const { return metric(PdmNumColors); } int depth() const { return metric(PdmDepth); } |