forked from qt-creator/qt-creator
Partial compile fix for current Qt dev and/or Qt 6
This does not cover Utils::MapReduceOption with QVector, and code that's not compiled on my machine. Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -458,9 +458,17 @@ void TextBrowserHelpWidget::resizeEvent(QResizeEvent *e)
|
||||
scrollToTextPosition(topTextPosition);
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
void TextBrowserHelpWidget::setSource(const QUrl &name)
|
||||
#else
|
||||
void TextBrowserHelpWidget::doSetSource(const QUrl &name, QTextDocument::ResourceType type)
|
||||
#endif
|
||||
{
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
QTextBrowser::setSource(name);
|
||||
#else
|
||||
QTextBrowser::doSetSource(name, type);
|
||||
#endif
|
||||
|
||||
QTextCursor cursor(document());
|
||||
while (!cursor.atEnd()) {
|
||||
|
||||
@@ -92,7 +92,11 @@ public:
|
||||
void scaleUp();
|
||||
void scaleDown();
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
void setSource(const QUrl &name) override;
|
||||
#else
|
||||
void doSetSource(const QUrl &url, QTextDocument::ResourceType type) override;
|
||||
#endif
|
||||
|
||||
void withFixedTopPosition(const std::function<void()> &action);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user