Merge remote-tracking branch 'origin/2.5'

Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
This commit is contained in:
Eike Ziller
2012-04-27 17:02:39 +02:00
28 changed files with 735 additions and 378 deletions

View File

@@ -161,7 +161,7 @@
You can filter the documents displayed in the \gui Help mode to find
relevant information faster. Select from a list of filters in the
\gui {Filtered by} field. The contents of the \gui Index and \gui Contents
\gui {Filtered by} field (1). The contents of the \gui Index and \gui Contents
pane in the sidebar change accordingly.
\image qtcreator-help-filters.png "Help filters"