summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-08-17 18:27:45 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-08-17 18:30:14 (GMT)
commitf330818d5e9dda6af7407f08935e1d66c9b04d12 (patch)
tree9e57fc3736b2d744c505caea486e95b2008857e0 /src/gui
parent42e342d1b3924206c7fa4175cb064dc2bbe0f00c (diff)
downloadQt-f330818d5e9dda6af7407f08935e1d66c9b04d12.zip
Qt-f330818d5e9dda6af7407f08935e1d66c9b04d12.tar.gz
Qt-f330818d5e9dda6af7407f08935e1d66c9b04d12.tar.bz2
Make QWS compile again
025a7395153c3708e2964cfd93957532b19ae04f broke the build on QWS because of duplicate symbols. Reviewed-by: Donald <qt-info@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qpaintdevice_qws.cpp33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/gui/painting/qpaintdevice_qws.cpp b/src/gui/painting/qpaintdevice_qws.cpp
index 9a6a3d3..b161cb8 100644
--- a/src/gui/painting/qpaintdevice_qws.cpp
+++ b/src/gui/painting/qpaintdevice_qws.cpp
@@ -48,39 +48,6 @@
QT_BEGIN_NAMESPACE
-QPaintDevice::QPaintDevice()
-{
- painters = 0;
-}
-
-extern void qt_painter_removePaintDevice(QPaintDevice *); //qpainter.cpp
-
-
-QPaintDevice::~QPaintDevice()
-{
- if (paintingActive())
- qWarning("QPaintDevice: Cannot destroy paint device that is being "
- "painted");
- qt_painter_removePaintDevice(this);
-}
-
-
-int QPaintDevice::metric(PaintDeviceMetric m) const
-{
- qWarning("QPaintDevice::metrics: Device has no metric information");
- if (m == PdmDpiX) {
- return 72;
- } else if (m == PdmDpiY) {
- return 72;
- } else if (m == PdmNumColors) {
- // FIXME: does this need to be a real value?
- return 256;
- } else {
- qDebug("Unrecognised metric %d!",m);
- return 0;
- }
-}
-
QWSDisplay *QPaintDevice::qwsDisplay()
{
return qt_fbdpy;