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:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
This commit is contained in:
Oswald Buddenhagen
2014-03-27 18:20:00 +01:00
parent 187bb36945 0afa004c0b
commit f013c41d05
272 changed files with 8516 additions and 10735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/remotehelpfilter.cpp
View File

@@ -85,11 +85,11 @@ RemoteHelpFilter::RemoteHelpFilter()
setIncludedByDefault(false);
setShortcutString(QLatin1String("r"));
m_remoteUrls.append(QLatin1String("http://www.bing.com/search?q=%1"));
m_remoteUrls.append(QLatin1String("http://www.google.com/search?q=%1"));
m_remoteUrls.append(QLatin1String("http://search.yahoo.com/search?p=%1"));
m_remoteUrls.append(QLatin1String("http://www.cplusplus.com/reference/stl/%1"));
m_remoteUrls.append(QLatin1String("http://en.wikipedia.org/w/index.php?search=%1"));
m_remoteUrls.append(QLatin1String("https://www.bing.com/search?q=%1"));
m_remoteUrls.append(QLatin1String("https://www.google.com/search?q=%1"));
m_remoteUrls.append(QLatin1String("https://search.yahoo.com/search?p=%1"));
m_remoteUrls.append(QLatin1String("https://www.cplusplus.com/reference/stl/%1"));
m_remoteUrls.append(QLatin1String("https://en.wikipedia.org/w/index.php?search=%1"));
}
RemoteHelpFilter::~RemoteHelpFilter()