diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-30 13:39:48 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-30 13:39:48 (GMT) |
| commit | 6a907f37d698eadc9cc35712b9cda48ba19e634d (patch) | |
| tree | d1df866f6a19901f5fe0431e5609cfc2d02484a9 /src/opengl | |
| parent | 8097fa53b5e0e6228bd5737de6de8cd77c04dddf (diff) | |
| parent | 8c4edbd04f350294462fd689748de2dd7cc84d47 (diff) | |
| download | Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.zip Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.tar.gz Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.tar.bz2 | |
Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstream
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 42e1c1e..ebe101d 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -49,12 +49,12 @@ #include <qglpixelbuffer.h> #include <qcolormap.h> #include <qdesktopwidget.h> +#include <private/qwidget_p.h> #include "qdebug.h" #ifdef Q_WS_X11 #include <private/qt_x11_p.h> #include <qx11info_x11.h> -#include <private/qwidget_p.h> #ifndef QT_OPENGL_ES #include <GL/glx.h> @@ -195,6 +195,9 @@ public: if (!initializing && !widget && !cleanedUp) { initializing = true; widget = new QGLWidget; + // We dont need this internal widget to appear in QApplication::topLevelWidgets() + if (QWidgetPrivate::allWidgets) + QWidgetPrivate::allWidgets->remove(widget); initializing = false; } return widget; |