summaryrefslogtreecommitdiffstats
path: root/src/openvg
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-04-05 10:49:33 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2011-04-05 10:56:30 (GMT)
commit4dc5dafb4c5185a81446463382e7eab2c3a0b21e (patch)
treeeb25d8d59f6420a7be762ef958221f9f6721d942 /src/openvg
parent0e12c56a972320a608bbb8c31b7726674f000bb1 (diff)
downloadQt-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/openvg')
-rw-r--r--src/openvg/qpaintengine_vg.cpp3
-rw-r--r--src/openvg/qpixmapdata_vg.cpp4
2 files changed, 1 insertions, 6 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 570adfd..3c2b5fd 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -77,9 +77,6 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
#if !defined(QVG_NO_DRAW_GLYPHS)
-Q_GUI_EXPORT int qt_defaultDpiX();
-Q_GUI_EXPORT int qt_defaultDpiY();
-
class QVGPaintEnginePrivate;
typedef QHash<QFontEngine*, QVGFontGlyphCache*> QVGFontCache;
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 80f5b2f..ea93748 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -51,6 +51,7 @@
#include <QImageReader>
#include <QtGui/private/qimage_p.h>
#include <QtGui/private/qnativeimagehandleprovider_p.h>
+#include <QtGui/private/qfont_p.h>
QT_BEGIN_NAMESPACE
@@ -470,9 +471,6 @@ void QVGPixmapData::reclaimImages()
destroyImages();
}
-Q_GUI_EXPORT int qt_defaultDpiX();
-Q_GUI_EXPORT int qt_defaultDpiY();
-
int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
{
switch (metric) {