summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-09-08 22:54:48 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-09-08 22:54:48 (GMT)
commit1b08e9bf28ba4f2c49b9240abc59f805802bdc1d (patch)
treeb2c865a6feec197a0034a7b82a2cd43e2a025ff6 /src/gui/kernel/qwidget.h
parentd29c604b0365dfbc20f8aea8d2cb63f621995219 (diff)
parentf52dc5bf1e885c9a4d226c2484249e7d9faf0a99 (diff)
downloadQt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.zip
Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.gz
Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qwidget.h')
-rw-r--r--src/gui/kernel/qwidget.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 284558f..bd30cad 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -731,6 +731,7 @@ private:
friend class QGLContext;
friend class QGLWidget;
friend class QGLWindowSurface;
+ friend class QGLWindowSurfaceGLPaintDevice;
friend class QVGWindowSurface;
friend class QX11PaintEngine;
friend class QWin32PaintEngine;