Merge branch 'qtscript-designer' into qtscript
authorAndrey Paskal <apaskal@gmail.com>
Fri, 27 Oct 2017 09:14:51 +0000 (12:14 +0300)
committerAndrey Paskal <apaskal@gmail.com>
Fri, 27 Oct 2017 09:14:51 +0000 (12:14 +0300)

Trivial merge