From 637b8aa2361fea8c0ea6579a6308ae594e6d8633 Mon Sep 17 00:00:00 2001 From: Trond Kjernaasen Date: Mon, 30 Mar 2009 16:15:15 +0200 Subject: Fix threaded QImage text drawing under Windows. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt_win_display() will always trigger an assert and should not be used in the src/painting directory. Task-number: 248266 Reviewed-by: Samuel Rødal --- src/gui/image/qnativeimage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/image/qnativeimage.cpp') diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 6b74323146..33e565c841 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -100,7 +100,9 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool is bmi.blueMask = 0; } - hdc = CreateCompatibleDC(qt_win_display_dc()); + HDC display_dc = GetDC(0); + hdc = CreateCompatibleDC(display_dc); + ReleaseDC(0, display_dc); Q_ASSERT(hdc); uchar *bits = 0; -- cgit v1.2.3