diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-07-20 15:45:12 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-21 15:44:29 +0000 |
| commit | fba81d4d00242d67ae041930692f692de8308ae7 (patch) | |
| tree | 79bdeb2ae947d5d0f6a8dbcf97dd78edf74900d2 | |
| parent | 5297289a3c4c180572da8d53e89235b9da8643af (diff) | |
QHelpIndexWidget: guard the usage of deprecated signals
... so that we could compile the code with QT_DISABLE_DEPRECATED_BEFORE
Task-number: QTBUG-104968
Change-Id: Iee39a3a5af51b6f9b02fa0eccac3f15aaceb778d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 9d8aa919e681ff27fab97efabfe1b43338eb6048)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/assistant/help/qhelpindexwidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp index eaaf44ed3..6be281466 100644 --- a/src/assistant/help/qhelpindexwidget.cpp +++ b/src/assistant/help/qhelpindexwidget.cpp @@ -365,6 +365,7 @@ void QHelpIndexWidget::showLink(const QModelIndex &index) const QList<QHelpLink> &docs = indexModel->helpEngine()->documentsForKeyword(name); if (docs.count() > 1) { emit documentsActivated(docs, name); +#if QT_DEPRECATED_SINCE(5, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED QMultiMap<QString, QUrl> links; @@ -372,12 +373,15 @@ void QHelpIndexWidget::showLink(const QModelIndex &index) links.insert(doc.title, doc.url); emit linksActivated(links, name); QT_WARNING_POP +#endif } else if (!docs.isEmpty()) { emit documentActivated(docs.first(), name); +#if QT_DEPRECATED_SINCE(5, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED emit linkActivated(docs.first().url, name); QT_WARNING_POP +#endif } } |