[umbrello/frameworks] /: Merge remote-tracking branch 'origin/master' into frameworks

[Luigi Toscano]

On Wednesday, 9 November 2016 13:02:39 CET Ralf Habacker wrote:
> Git commit 51a80ad0ee1a75eece18f92dcdc7fd2bc07cb965 by Ralf Habacker.
> Committed on 09/11/2016 at 13:01.
> Pushed by habacker into branch 'frameworks'.
> 
> Merge remote-tracking branch 'origin/master' into frameworks
> 
> Conflicts:
> 	CMakeLists.txt
> 	doc/CMakeLists.txt
> 	umbrello/CMakeLists.txt
> 	umbrello/uml.cpp
> 	unittests/CMakeLists.txt

Hi, 
is there a possible solution to not duplicate functionalities from kdoctools?
Also, I think that you can depend on ECM also on the kdelibs4 version. Or even 
better, please merge frameworks into master: Qt4 is on the way of the dodo.

-- 
Luigi