diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-10 09:07:19 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-10 09:07:19 (GMT) |
commit | a3256014d6adb31c89b0e5de5b0decc393649b70 (patch) | |
tree | cd315ffdb3e35f4040b268e9dc083244da084b2a /src/gui/painting/qwindowsurface_qws_p.h | |
parent | b17cc4918bfc4b250293000bdabcb8f2dbdec787 (diff) | |
parent | 2c232cdbce3eba095da26362b964f411a9d3ba80 (diff) | |
download | Qt-a3256014d6adb31c89b0e5de5b0decc393649b70.zip Qt-a3256014d6adb31c89b0e5de5b0decc393649b70.tar.gz Qt-a3256014d6adb31c89b0e5de5b0decc393649b70.tar.bz2 |
Merge branch '4.6'
Diffstat (limited to 'src/gui/painting/qwindowsurface_qws_p.h')
-rw-r--r-- | src/gui/painting/qwindowsurface_qws_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qwindowsurface_qws_p.h b/src/gui/painting/qwindowsurface_qws_p.h index 2c45120..6c65db3 100644 --- a/src/gui/painting/qwindowsurface_qws_p.h +++ b/src/gui/painting/qwindowsurface_qws_p.h @@ -173,7 +173,7 @@ public: QPaintDevice *paintDevice() { return &img; } bool scroll(const QRegion &area, int dx, int dy); - QImage image() const { return img; }; + QImage image() const { return img; } QPoint painterOffset() const; bool lock(int timeout = -1); |