From 18e2300337d9e914fc63bebe28d0aa2af765a05e Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 17 Jun 2020 11:49:33 +0200
Subject: [PATCH] QLiteHtml: Remove accidentally introduced dependency on Utils

Amends 1c81a3b3e.

Change-Id: I4a1b0cae5bac5bd5801e1868420e9e23598c0c79
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/help/qlitehtml/container_qpainter.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/help/qlitehtml/container_qpainter.cpp b/src/plugins/help/qlitehtml/container_qpainter.cpp
index 96dffd7330a..af0dd9a65c3 100644
--- a/src/plugins/help/qlitehtml/container_qpainter.cpp
+++ b/src/plugins/help/qlitehtml/container_qpainter.cpp
@@ -25,8 +25,6 @@
 
 #include "container_qpainter.h"
 
-#include <utils/stringutils.h>
-
 #include <QClipboard>
 #include <QCursor>
 #include <QDebug>
@@ -448,7 +446,12 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
                                                   unsigned int decoration,
                                                   litehtml::font_metrics *fm)
 {
-    const QStringList splitNames = QString::fromUtf8(faceName).split(',', Utils::SkipEmptyParts);
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    constexpr auto SkipEmptyParts = QString::SkipEmptyParts;
+#else
+    constexpr auto SkipEmptyParts = Qt::SkipEmptyParts;
+#endif
+    const QStringList splitNames = QString::fromUtf8(faceName).split(',', SkipEmptyParts);
     QStringList familyNames;
     std::transform(splitNames.cbegin(),
                    splitNames.cend(),