Merge "Don't allow both setRelative and setLayer for the same surface." into...
Merge "Don't allow both setRelative and setLayer for the same surface." into qt-dev am: 68b39308 am: dc463c40
am: 02fcb566
Change-Id: I9098e7e3bc2169ba4a48608aca0fd8020f707dfa