summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-06-18 13:09:12 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:06:18 (GMT)
commit25a8a8e0c32580d3f9c2a2fbd88da1737e42749b (patch)
tree95498b1a02860983e5ee765589af67a91e9544fa
parent2171aaf711773ecfc66bae13558f8edbce58a39b (diff)
downloadQt-25a8a8e0c32580d3f9c2a2fbd88da1737e42749b.zip
Qt-25a8a8e0c32580d3f9c2a2fbd88da1737e42749b.tar.gz
Qt-25a8a8e0c32580d3f9c2a2fbd88da1737e42749b.tar.bz2
Fixed device context leak in QGLWidget on Windows.
Commit 392123ef5432643d1047d1e1dd71512ec39d382d introduced the leak. Task-number: QTBUG-11432 Reviewed-by: Trond (cherry picked from commit 38adb59a9e80a23d37ff0820ef62ebd45ab1e4ae)
-rw-r--r--src/gui/kernel/qapplication_win.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index fbfd40f..44748ac 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -933,6 +933,9 @@ const QString qt_reg_winclass(QWidget *w) // register window class
if (qt_widget_private(w)->isGLWidget) {
cname = QLatin1String("QGLWidget");
style = CS_DBLCLKS;
+#ifndef Q_WS_WINCE
+ style |= CS_OWNDC;
+#endif
icon = true;
} else if (flags & Qt::MSWindowsOwnDC) {
cname = QLatin1String("QWidgetOwnDC");