From 255ecba26909408d57c0d58ca211f810c66ce126 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 9 Feb 2015 12:07:39 +0100 Subject: [PATCH] Windows: Remove "experimental" sticker for DirectWrite engine This engine has been regarded "experimental" for a long time, but it is in active use by some applications and rather stable. While if may be replaced by FreeType at some point, if support for Microsoft's colored fonts is introduced there, at this point it really doesn't make sense to call it "experimental" anymore. Change-Id: I038d71b121e90bd7b4dbc6d0afa7b14c9b824b08 Reviewed-by: Andy Shaw --- .../platforms/windows/qwindowsfontenginedirectwrite.cpp | 4 ---- tools/configure/configureapp.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp index 27087b4504..85cd92b234 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp @@ -184,10 +184,6 @@ namespace { database uses most of the same logic but creates a direct write font based on the LOGFONT rather than a GDI handle. - The engine is currently regarded as experimental, meaning that code - using it should do substantial testing to make sure it covers their - use cases. - Will probably be superseded by a common Free Type font engine in Qt 5.X. */ diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 81be286a7c..0516ad7cd8 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1990,7 +1990,7 @@ bool Configure::displayHelp() desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the in-process QML debugging support."); desc("QML_DEBUG", "yes", "-qml-debug", "Build the in-process QML debugging support.\n"); desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering."); - desc("DIRECTWRITE", "yes", "-directwrite", "Build support for DirectWrite font rendering (experimental, requires DirectWrite availability on target systems, e.g. Windows Vista with Platform Update, Windows 7, etc.)\n"); + desc("DIRECTWRITE", "yes", "-directwrite", "Build support for DirectWrite font rendering (requires DirectWrite availability on target systems, e.g. Windows Vista with Platform Update, Windows 7, etc.)\n"); desc("DIRECT2D", "no", "-no-direct2d", "Do not build the Direct2D platform plugin."); desc("DIRECT2D", "yes", "-direct2d", "Build the Direct2D platform plugin (experimental,\n"