feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QLiteHtml: Remove accidentally introduced dependency on Utils

Browse Source 
Amends 1c81a3b3e.

Change-Id: I4a1b0cae5bac5bd5801e1868420e9e23598c0c79
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-17 11:49:33 +02:00
parent aaa1376576
commit 18e2300337
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/help/qlitehtml/container_qpainter.cpp
View File

@@ -25,8 +25,6 @@
#include "container_qpainter.h" #include "container_qpainter.h"
#include <utils/stringutils.h>
#include <QClipboard> #include <QClipboard>
#include <QCursor> #include <QCursor>
#include <QDebug> #include <QDebug>
@@ -448,7 +446,12 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
unsigned int decoration, unsigned int decoration,
litehtml::font_metrics *fm) 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; QStringList familyNames;
std::transform(splitNames.cbegin(), std::transform(splitNames.cbegin(),
splitNames.cend(), splitNames.cend(),