Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Eike Ziller
2013-10-14 15:31:54 +02:00
276 changed files with 2451 additions and 2043 deletions

View File

@@ -326,7 +326,7 @@ bool Project::restoreSettings()
This map is then saved in the .user file of the project.
Just put all your data into the map.
\note Do not forget to call your base class' toMap method.
\note Do not forget to call your base class' toMap function.
\note Do not forget to call setActiveBuildConfiguration when
creating new build configurations.
*/