diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/painting/qpaintdevice.cpp | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/painting/qpaintdevice.cpp')
-rw-r--r-- | src/gui/painting/qpaintdevice.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp index 7b3d4add49..fc5cdcdaa5 100644 --- a/src/gui/painting/qpaintdevice.cpp +++ b/src/gui/painting/qpaintdevice.cpp @@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE -extern void qt_painter_removePaintDevice(QPaintDevice *); //qpainter.cpp - QPaintDevice::QPaintDevice() { painters = 0; @@ -55,7 +53,6 @@ QPaintDevice::~QPaintDevice() if (paintingActive()) qWarning("QPaintDevice: Cannot destroy paint device that is being " "painted"); - qt_painter_removePaintDevice(this); } @@ -67,6 +64,20 @@ int QPaintDevice::metric(PaintDeviceMetric) const } #endif +void QPaintDevice::init(QPainter *) const +{ +} + +QPaintDevice *QPaintDevice::redirected(QPoint *) const +{ + return 0; +} + +QPainter *QPaintDevice::sharedPainter() const +{ + return 0; +} + Q_GUI_EXPORT int qt_paint_device_metric(const QPaintDevice *device, QPaintDevice::PaintDeviceMetric metric) { return device->metric(metric); |