diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-27 22:04:23 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-27 22:04:23 (GMT) |
| commit | de61a3cf52efa43b258f9c19dfe4d984fc629324 (patch) | |
| tree | 9a4e887852aa9be12168d802ff0a5ec61ea85b49 /src/gui/kernel | |
| parent | 8af3500125a03a54dddb8c46ee709b7b8d257f27 (diff) | |
| parent | 572d3b04aacfd211ea930ac5460562d8b3f6232b (diff) | |
| download | Qt-de61a3cf52efa43b258f9c19dfe4d984fc629324.zip Qt-de61a3cf52efa43b258f9c19dfe4d984fc629324.tar.gz Qt-de61a3cf52efa43b258f9c19dfe4d984fc629324.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 1635912..9f0d2a4 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -183,6 +183,7 @@ QWidgetPrivate::QWidgetPrivate(int version) : ,inDirtyList(0) ,isScrolled(0) ,isMoved(0) + ,usesDoubleBufferedGLContext(0) #ifdef Q_WS_WIN ,noPaintOnScreen(0) #endif @@ -2132,6 +2133,10 @@ QWidget *QWidget::find(WId id) If a widget is non-native (alien) and winId() is invoked on it, that widget will be provided a native handle. + On Mac OS X, the type returned depends on which framework Qt was linked + against. If Qt is using Carbon, the {WId} is actually an HIViewRef. If Qt + is using Cocoa, {WId} is a pointer to an NSView. + \note We recommend that you do not store this value as it is likely to change at run-time. diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index c403ccc..8731551 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -531,6 +531,7 @@ public: uint inDirtyList : 1; uint isScrolled : 1; uint isMoved : 1; + uint usesDoubleBufferedGLContext : 1; #ifdef Q_WS_WIN uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() |