summaryrefslogtreecommitdiffstats
path: root/src/openvg/qpixmapdata_vg.cpp
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2011-01-10 19:21:05 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-01-17 12:37:53 (GMT)
commit7ec1c27e662dfd4393491f90bfcb9c868cc0a23f (patch)
tree6c11c1021fce78885344501cee1f5e9971ffce7b /src/openvg/qpixmapdata_vg.cpp
parent0953ee31dba532603fb7dfbde78c99aafb048bef (diff)
downloadQt-7ec1c27e662dfd4393491f90bfcb9c868cc0a23f.zip
Qt-7ec1c27e662dfd4393491f90bfcb9c868cc0a23f.tar.gz
Qt-7ec1c27e662dfd4393491f90bfcb9c868cc0a23f.tar.bz2
Fix static build on Windows with MinGW.
Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for static code. Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when declaring QtCore functions in svg. Now we change Q_DECL_IMPORT to Q_GUI_EXPORT when declaring QtGui functions into opengl and openvg. Also removed the redundant keyword "extern" from the function declarations. Merge-request: 2540 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
Diffstat (limited to 'src/openvg/qpixmapdata_vg.cpp')
-rw-r--r--src/openvg/qpixmapdata_vg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 3f768fd..e4b1d02 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -404,8 +404,8 @@ void QVGPixmapData::reclaimImages()
destroyImages();
}
-Q_DECL_IMPORT extern int qt_defaultDpiX();
-Q_DECL_IMPORT extern int qt_defaultDpiY();
+Q_GUI_EXPORT int qt_defaultDpiX();
+Q_GUI_EXPORT int qt_defaultDpiY();
int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
{