Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/shared/qbs

Change-Id: I9567aa9331c3674cdce50b940c3ec2b5def7bd3f
This commit is contained in:
Eike Ziller
2014-06-16 16:15:22 +02:00
2 changed files with 14 additions and 0 deletions

View File

@@ -190,4 +190,9 @@
\key {Ctrl+Shift+F12}.
\QC generates the code model inspection log file in a temporary folder.
\QC underlines semantic errors in olive in the C++ code editor. To
check the correct paths for includes that are not resolved or that are
resolved to the wrong file, select \gui {Project Parts} >
\gui {Include Paths}.
*/