Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
This commit is contained in:
Eike Ziller
2013-06-25 10:14:14 +02:00
376 changed files with 3762 additions and 2070 deletions

View File

@@ -43,8 +43,8 @@ namespace Core {
/*!
\class Core::Id
\brief The class Id encapsulates an identifier that is unique
within a specific running Qt Creator process.
\brief The Id class encapsulates an identifier that is unique
within a specific running \QC process.
\c{Core::Id} is used as facility to identify objects of interest
in a more typesafe and faster manner than a plain \c QString or