diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-29 08:08:04 (GMT) |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-29 08:08:04 (GMT) |
commit | 23a92388505c54155855d2f49d3a9cf81de0e5ea (patch) | |
tree | e27be8f97b6781540579d5a507914cf03272ba3d /src/gui/painting/qpaintdevice_qws.cpp | |
parent | 560ca373e4879f335a0ceeb3f8a769cc0e4297fe (diff) | |
parent | 8acc20e525d589e0c4450fbd60141e8b9c3f40e9 (diff) | |
download | Qt-23a92388505c54155855d2f49d3a9cf81de0e5ea.zip Qt-23a92388505c54155855d2f49d3a9cf81de0e5ea.tar.gz Qt-23a92388505c54155855d2f49d3a9cf81de0e5ea.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/gui/painting/qpaintdevice_qws.cpp')
-rw-r--r-- | src/gui/painting/qpaintdevice_qws.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/painting/qpaintdevice_qws.cpp b/src/gui/painting/qpaintdevice_qws.cpp index 6a68d28..c67be86 100644 --- a/src/gui/painting/qpaintdevice_qws.cpp +++ b/src/gui/painting/qpaintdevice_qws.cpp @@ -81,9 +81,6 @@ int QPaintDevice::metric(PaintDeviceMetric m) const } } -/*! - \internal -*/ QWSDisplay *QPaintDevice::qwsDisplay() { return qt_fbdpy; |