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

Use Qt::SkipEmptyParts unconditionally

Browse Source 
Squashes a warning in qmldebugtranslationwidget and is safe to use
with Qt 5.14.

Change-Id: I1912e7379a570a17fbf057b87390a63d524ced49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-08-14 07:22:30 +02:00
parent 760d91665f
commit e62044aa29
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,12 +446,7 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
unsigned int decoration,
litehtml::font_metrics *fm)
{
#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);
const QStringList splitNames = QString::fromUtf8(faceName).split(',', Qt::SkipEmptyParts);
QStringList familyNames;
std::transform(splitNames.cbegin(),
splitNames.cend(),