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/qglpixelbuffer.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/qglpixelbuffer.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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 { |