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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
This commit is contained in:
Eike Ziller
2014-03-04 14:04:07 +01:00
parent 73c5eae311 3ee64ed699
commit 3ba9db48ed
72 changed files with 499 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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