Merge "Don't allow both setRelative and setLayer for the same surface." into qt-dev
am: 68b393081e

Change-Id: Ife00b73b5db8135a00413085bef1921376e7288b