Mercurial > octave
changeset 29175:0ce474653a35
maint: merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 11 Dec 2020 11:43:31 -0500 |
parents | 4363b185d31f (current diff) 4ca50ceb9576 (diff) |
children | 7d262c7f8b1d |
files | |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/documentation.cc Fri Dec 11 05:15:39 2020 -0500 +++ b/libgui/src/documentation.cc Fri Dec 11 11:43:31 2020 -0500 @@ -632,23 +632,25 @@ if (! m_help_engine || ref_name.isEmpty ()) return; - // First search in the function index #if defined (HAVE_QHELPENGINE_DOCUMENTSFORIDENTIFIER) QList<QHelpLink> found_links = m_help_engine->documentsForIdentifier (ref_name); - - QUrl first_url = found_links.constFirst().url; #else QMap<QString, QUrl> found_links = m_help_engine->linksForIdentifier (ref_name); - - QUrl first_url = found_links.constBegin().value (); #endif - QTabWidget *navi = static_cast<QTabWidget*> (widget (0)); + QTabWidget *navi = static_cast<QTabWidget*> (widget (0)); if (found_links.count() > 0) { + // First search in the function index +#if defined (HAVE_QHELPENGINE_DOCUMENTSFORIDENTIFIER) + QUrl first_url = found_links.constFirst().url; +#else + QUrl first_url = found_links.constBegin().value (); +#endif + m_doc_browser->setSource (first_url); // Switch to function index tab