From 8e3efd92c68855365d6d20802bc3d0fa5ee45f74 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 11 Sep 2017 12:33:35 +0200 Subject: Fix Get Started Now (and other links) If we do not specify the correct documentation URL including the version number, QtHelp will look for any documentation that has the given path. Since we now register Qbs documentation, and that also has a file "doc/index.html", the Get Started Now button could open the Qbs manual instead of the Qt Creator one. Specify the full documentation URL including version number to ensure that QtHelp opens the right page. Change-Id: Ia77103fe2763dd208d3b9a279a8301f7f5799c8b Reviewed-by: Christian Stenger Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller --- src/plugins/help/helpplugin.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/plugins/help') diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 39fe63a376..2057059483 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -629,6 +629,16 @@ void HelpPlugin::highlightSearchTermsInContextHelp() void HelpPlugin::handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocation location) { + static const QString qtcreatorUnversionedID = "org.qt-project.qtcreator"; + if (url.host() == qtcreatorUnversionedID) { + // QtHelp doesn't know about versions, add the version number and use that + QUrl versioned = url; + versioned.setHost(qtcreatorUnversionedID + "." + + QString::fromLatin1(Core::Constants::IDE_VERSION_LONG).remove('.')); + handleHelpRequest(versioned, location); + return; + } + if (HelpViewer::launchWithExternalApp(url)) return; @@ -639,7 +649,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocat || address.startsWith("qthelp://com.trolltech.")) { // local help not installed, resort to external web help QString urlPrefix = "http://doc.qt.io/"; - if (url.authority() == "org.qt-project.qtcreator") + if (url.authority().startsWith(qtcreatorUnversionedID)) urlPrefix.append(QString::fromLatin1("qtcreator")); else urlPrefix.append("qt-5"); -- cgit v1.2.3