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

Fix F1 sometimes opening explorer/finder if documentation is not found

Browse Source 
It's not sufficient to try to create a QUrl on a string to find out if
it is an url, because that automatically treats strings without any
special characters as "local file urls".

Task-number: QTCREATORBUG-11570
Change-Id: I18071aed5b3fbdd717b045c2f6e3e90385be8584
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-02-26 12:18:35 +01:00
parent c4f5bdfbdb
commit e4feb5e326
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/help/helpplugin.cpp
View File

@@ -874,9 +874,12 @@ void HelpPlugin::activateContext()
links = HelpManager::linksForIdentifier(m_idFromContext); links = HelpManager::linksForIdentifier(m_idFromContext);
if (links.isEmpty()) { if (links.isEmpty()) {
// Maybe this is already an URL... // Maybe this is already an URL...
QUrl url(m_idFromContext); // Require protocol specifier, otherwise most strings would be 'local file names'
if (url.isValid()) if (m_idFromContext.contains(QLatin1Char(':'))) {
links.insert(m_idFromContext, m_idFromContext); QUrl url(m_idFromContext);
if (url.isValid())
links.insert(m_idFromContext, m_idFromContext);
}
} }
} }