Merge remote-tracking branch 'origin/5.5' into 5.6
authorLiang Qi <liang.qi@theqtcompany.com>
Fri, 28 Aug 2015 08:39:53 +0000 (10:39 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Fri, 28 Aug 2015 08:40:09 +0000 (10:40 +0200)
commitf90f26c8f5610048b7c91776099e419452d9970a
tree5a89835d9be949a372a76df04d1e3532a8189481
parent8796c382910662bb26b364ec201f2d05e1c851fe
parent1d7b5b2e1c798335e20c7fc269e8f8238505eba0
Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ic1c578187b99013c40fe686f98fc85d5917240fe
src/designer/src/designer/doc/src/designer-manual.qdoc