Merge remote-tracking branch 'origin/3.1'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 724baef15e..7001cfe159 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -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);
+            }
         }
     }