diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 05:22:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 05:22:01 (GMT) |
| commit | 0eff2621a818d3690a5c536b35df079b23be6a84 (patch) | |
| tree | 5db86a7a3e135282e19b0d3b13c0984e966b08c5 /src/gui/kernel/qwidget.h | |
| parent | 67c465988a45d1f0a5d9dce3c03ad544a6e24cfe (diff) | |
| parent | 88eaabd88187178a737ea9476463f20f68087a52 (diff) | |
| download | Qt-0eff2621a818d3690a5c536b35df079b23be6a84.zip Qt-0eff2621a818d3690a5c536b35df079b23be6a84.tar.gz Qt-0eff2621a818d3690a5c536b35df079b23be6a84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Experimental support of the unified toolbar with
Diffstat (limited to 'src/gui/kernel/qwidget.h')
| -rw-r--r-- | src/gui/kernel/qwidget.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index 980f40f..81b3618 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -97,6 +97,8 @@ class QWindowSurface; class QLocale; class QGraphicsProxyWidget; class QGraphicsEffect; +class QRasterWindowSurface; +class QUnifiedToolbarSurface; #if defined(Q_WS_X11) class QX11Info; #endif @@ -758,6 +760,8 @@ private: friend OSViewRef qt_mac_nativeview_for(const QWidget *w); friend void qt_event_request_window_change(QWidget *widget); friend bool qt_mac_sendMacEventToWidget(QWidget *widget, EventRef ref); + friend class QRasterWindowSurface; + friend class QUnifiedToolbarSurface; #endif #ifdef Q_WS_QWS friend class QWSBackingStore; |