diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 13:29:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 13:29:05 (GMT) |
| commit | 7d5877d245e4740eaebfc963dbf46ec8dfb246ca (patch) | |
| tree | 0e02eb14e3322003c848d6b3091226c27f2cb574 /src/opengl/qpixmapdata_gl.cpp | |
| parent | e8979d11428da7b705f295afd432b45d4d8dffcc (diff) | |
| parent | 90bc27ebe4dc59c3966ba9b3b18fa209e24afd7d (diff) | |
| download | Qt-7d5877d245e4740eaebfc963dbf46ec8dfb246ca.zip Qt-7d5877d245e4740eaebfc963dbf46ec8dfb246ca.tar.gz Qt-7d5877d245e4740eaebfc963dbf46ec8dfb246ca.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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) |