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

Help: Fix compilation with Qt6

Browse Source 
Adapt to size type and QFont::weight() changes.

Task-number: QTCREATORBUG-24098
Change-Id: I580601433c9f81b7675b806d5eb2c55ee3060011
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-07 10:10:17 +02:00
parent 158ac2d339
commit d8c3487037
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,7 +188,7 @@ static Selection::Element selectionDetails(const litehtml::element::ptr &element
return {element, i, previous}; return {element, i, previous};
previous = width; previous = width;
} }
return {element, text.size(), previous}; return {element, int(text.size()), previous};
} }
static Selection::Element deepest_child_at_point(const litehtml::document::ptr &document, static Selection::Element deepest_child_at_point(const litehtml::document::ptr &document,
@@ -236,14 +236,19 @@ static Selection::Element deepest_child_at_point(const litehtml::document::ptr &
} }
// CSS: 400 == normal, 700 == bold. // CSS: 400 == normal, 700 == bold.
// Qt: 50 == normal, 75 == bold // Qt5: 50 == normal, 75 == bold
static int cssWeightToQtWeight(int cssWeight) // Qt6: == CSS
static QFont::Weight cssWeightToQtWeight(int cssWeight)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return QFont::Weight(cssWeight);
#else
if (cssWeight <= 400) if (cssWeight <= 400)
return cssWeight * 50 / 400; return QFont::Weight(cssWeight * 50 / 400);
if (cssWeight >= 700) if (cssWeight >= 700)
return 75 + (cssWeight - 700) * 25 / 300; return QFont::Weight(75 + (cssWeight - 700) * 25 / 300);
return 50 + (cssWeight - 400) * 25 / 300; return QFont::Weight(50 + (cssWeight - 400) * 25 / 300);
#endif
} }
static QFont::Style toQFontStyle(litehtml::font_style style) static QFont::Style toQFontStyle(litehtml::font_style style)
@@ -1194,7 +1199,7 @@ void DocumentContainer::findText(const QString &text,
m_selection = {}; m_selection = {};
m_selection.startElem = fillXPos({startEntry.second, foundIndex - startEntry.first, -1}); m_selection.startElem = fillXPos({startEntry.second, foundIndex - startEntry.first, -1});
m_selection.endElem = fillXPos( m_selection.endElem = fillXPos(
{endEntry.second, foundIndex + text.size() - endEntry.first, -1}); {endEntry.second, int(foundIndex + text.size() - endEntry.first), -1});
m_selection.update(); m_selection.update();
if (newSelection) if (newSelection)
*newSelection = m_selection.selection; *newSelection = m_selection.selection;