diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-05 10:49:33 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-05 10:56:30 (GMT) |
| commit | 4dc5dafb4c5185a81446463382e7eab2c3a0b21e (patch) | |
| tree | eb25d8d59f6420a7be762ef958221f9f6721d942 /src/opengl | |
| parent | 0e12c56a972320a608bbb8c31b7726674f000bb1 (diff) | |
| download | Qt-4dc5dafb4c5185a81446463382e7eab2c3a0b21e.zip Qt-4dc5dafb4c5185a81446463382e7eab2c3a0b21e.tar.gz Qt-4dc5dafb4c5185a81446463382e7eab2c3a0b21e.tar.bz2 | |
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qpixmapdata_poolgl.cpp | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index cda1c79..8eda222 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -44,6 +44,7 @@ #include <qdebug.h> #include <private/qgl_p.h> +#include <private/qfont_p.h> #if !defined(QT_OPENGL_ES_1) #include <private/qpaintengineex_opengl2_p.h> #endif @@ -1216,9 +1217,6 @@ void QGLFramebufferObject::drawTexture(const QPointF &point, QMacCompatGLuint te } #endif -Q_GUI_EXPORT int qt_defaultDpiX(); -Q_GUI_EXPORT int qt_defaultDpiY(); - /*! \reimp */ int QGLFramebufferObject::metric(PaintDeviceMetric metric) const { diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index ec6ac4c..3278596 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -98,6 +98,7 @@ #include <qglpixelbuffer.h> #include <private/qglpixelbuffer_p.h> +#include <private/qfont_p.h> #include <qimage.h> #ifndef QT_OPENGL_ES_2 @@ -424,9 +425,6 @@ QPaintEngine *QGLPixelBuffer::paintEngine() const #endif } -Q_GUI_EXPORT int qt_defaultDpiX(); -Q_GUI_EXPORT int qt_defaultDpiY(); - /*! \reimp */ int QGLPixelBuffer::metric(PaintDeviceMetric metric) const { diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index db9f8c8..45722d1 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -49,6 +49,7 @@ #include <private/qgl_p.h> #include <private/qdrawhelper_p.h> #include <private/qimage_p.h> +#include <private/qfont_p.h> #include <private/qpaintengineex_opengl2_p.h> @@ -790,9 +791,6 @@ QGLTexture* QGLPixmapData::texture() const return &m_texture; } -Q_GUI_EXPORT int qt_defaultDpiX(); -Q_GUI_EXPORT int qt_defaultDpiY(); - int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { if (w == 0) diff --git a/src/opengl/qpixmapdata_poolgl.cpp b/src/opengl/qpixmapdata_poolgl.cpp index 44d9c84..8310b42 100644 --- a/src/opengl/qpixmapdata_poolgl.cpp +++ b/src/opengl/qpixmapdata_poolgl.cpp @@ -50,6 +50,7 @@ #include <private/qdrawhelper_p.h> #include <private/qimage_p.h> #include <private/qnativeimagehandleprovider_p.h> +#include <private/qfont_p.h> #include <private/qpaintengineex_opengl2_p.h> @@ -892,9 +893,6 @@ void QGLPixmapData::reclaimTexture() destroyTexture(); } -Q_GUI_EXPORT int qt_defaultDpiX(); -Q_GUI_EXPORT int qt_defaultDpiY(); - int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { if (w == 0) |