diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-10-21 09:26:31 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-10-21 09:26:31 (GMT) |
| commit | 7e7bf0449d567c99882a37bb138221dfca9a3ed0 (patch) | |
| tree | 2d84cfa02e5e5f97de79c3a148acb38ae7076b3d /src/opengl/qglpixelbuffer.cpp | |
| parent | 5102cf81c31ff59aca03273daab9d797eb818058 (diff) | |
| parent | 5f49392232dff904fdd3401cb739a1eaa79f7bd3 (diff) | |
| download | Qt-7e7bf0449d567c99882a37bb138221dfca9a3ed0.zip Qt-7e7bf0449d567c99882a37bb138221dfca9a3ed0.tar.gz Qt-7e7bf0449d567c99882a37bb138221dfca9a3ed0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 994947b..3992f34 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -416,8 +416,8 @@ QPaintEngine *QGLPixelBuffer::paintEngine() const #endif } -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_DECL_IMPORT extern int qt_defaultDpiX(); +Q_DECL_IMPORT extern int qt_defaultDpiY(); /*! \reimp */ int QGLPixelBuffer::metric(PaintDeviceMetric metric) const |