Merge remote-tracking branch 'origin/3.1'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
This commit is contained in:
Eike Ziller
2014-06-13 10:51:51 +02:00
28 changed files with 400 additions and 62 deletions

View File

@@ -199,6 +199,11 @@
\endlist
You can make additional files known to \QC, so that they become visible in
the \gui Projects view and known to the locator and search, but do not
affect the build system. Add the paths to the files to the \c OTHER_FILES
variable in the .pro file.
\section2 Viewing the File System
If you cannot see a file in the \gui Projects view, switch to the