1 files changed, 13 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 13369dc8f6..92256078dc 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -614,6 +614,13 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
         \li \c {dpiawareness=[0|1|2]} Sets the DPI awareness of the process
                (see \l{High DPI Displays}, since Qt 5.4).
         \li \c {fontengine=freetype}, uses the FreeType font engine.
+        \li \c {fontengine=directwrite}, uses the experimental DirectWrite
+               font database and defaults to using the DirectWrite font
+               engine (which is otherwise only used for some font types
+               or font properties.) This affects font selection and aims
+               to provide font naming more consistent with other platforms,
+               but does not support all font formats, such as Postscript
+               Type-1 or Microsoft FNT fonts.
         \li \c {menus=[native|none]}, controls the use of native menus.
 
                Native menus are implemented using Win32 API and are simpler than
@@ -1208,14 +1215,18 @@ Q_LOGGING_CATEGORY(lcQpaPluginLoading, "qt.qpa.plugin");
 
 static void init_platform(const QString &pluginNamesWithArguments, const QString &platformPluginPath, const QString &platformThemeName, int &argc, char **argv)
 {
-    QStringList plugins = pluginNamesWithArguments.split(QLatin1Char(';'));
+    QStringList plugins = pluginNamesWithArguments.split(QLatin1Char(';'), Qt::SkipEmptyParts);
     QStringList platformArguments;
     QStringList availablePlugins = QPlatformIntegrationFactory::keys(platformPluginPath);
     for (const auto &pluginArgument : plugins) {
         // Split into platform name and arguments
-        QStringList arguments = pluginArgument.split(QLatin1Char(':'));
+        QStringList arguments = pluginArgument.split(QLatin1Char(':'), Qt::SkipEmptyParts);
+        if (arguments.isEmpty())
+            continue;
         const QString name = arguments.takeFirst().toLower();
         QString argumentsKey = name;
+        if (name.isEmpty())
+            continue;
         argumentsKey[0] = argumentsKey.at(0).toUpper();
         arguments.append(QLibraryInfo::platformPluginArguments(argumentsKey));