2 Commits

Author	SHA1	Message	Date
Eike Ziller	5c121d5791	Merge remote-tracking branch 'origin/4.11' ... Conflicts: src/plugins/genericprojectmanager/genericproject.cpp Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca	2020-02-05 11:59:35 +01:00
Leena Miettinen	5fc456dd22	Doc: Rearrange files in the doc folder ... Source and configuration files for each manual are now located in a separate subdirectory, with common configuration files in doc/config. doc |_config |_qtcreator |_qtcreatordev |_qtdesignstudio Edit the config files accordingly. Change-Id: Idc747a7c16e84f3e06add91234dc5fc908e64cc5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>	2020-01-27 09:05:07 +00:00