From 9a14731b7cc95c18aad419ad7b8696a2f4ec39c9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 1 Apr 2014 10:36:12 +0200 Subject: Windows CE: Fix message about freetype font rendering. Task-number: QTBUG-37976 Change-Id: Ib4bf6ba8f62e2dc4f3860313442fa57c67f06d9a Reviewed-by: Joerg Bornemann --- src/plugins/platforms/windows/qplatformfunctions_wince.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/windows') diff --git a/src/plugins/platforms/windows/qplatformfunctions_wince.h b/src/plugins/platforms/windows/qplatformfunctions_wince.h index 30fc66563e..65ce466086 100644 --- a/src/plugins/platforms/windows/qplatformfunctions_wince.h +++ b/src/plugins/platforms/windows/qplatformfunctions_wince.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the plugins of the Qt Toolkit. @@ -293,8 +293,8 @@ inline void OleUninitialize() inline DWORD GetGlyphOutline( HDC /*hdc*/, UINT /*uChar*/, INT /*fuFormat*/, GLYPHMETRICS * /*lpgm*/, DWORD /*cjBuffer*/, LPVOID /*pvBuffer*/, CONST MAT2 * /*lpmat2*/ ) { - qFatal("GetGlyphOutline not supported under Windows CE. Please try using freetype fontrendering, by" - "passing -platform windows:freetype as arguments to the application."); + qFatal("GetGlyphOutline() not supported under Windows CE. Please try using freetype font-rendering, by " + "passing the command line argument -platform windows:fontengine=freetype to the application."); return GDI_ERROR; } -- cgit v1.2.3 From 229c98abf0069e181704c6db9043f0cec00eff97 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 8 Apr 2014 11:11:20 +0200 Subject: QWindowsOpenGLContextFormat: Default to version 2. glGetString() returns NULL when no current context exists. Task-number: QTBUG-38063 Change-Id: I5cdb265fb2d74bbc5f3e2c34528909323573b2e1 Reviewed-by: Laszlo Agocs --- src/plugins/platforms/windows/qwindowsglcontext.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/platforms/windows') diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index e7e4028079..eaa4eca84e 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -711,6 +711,8 @@ QWindowsOpenGLContextFormat QWindowsOpenGLContextFormat::current() minorDot = version.size(); result.version = (version.mid(0, majorDot).toInt() << 8) + version.mid(majorDot + 1, minorDot - majorDot - 1).toInt(); + } else { + result.version = 0x0200; } result.profile = QSurfaceFormat::NoProfile; if (result.version < 0x0300) { -- cgit v1.2.3